Combined window positioning and show state determiniation in the WindowSizer

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 3c1cde275767c7cc4fb2545e1bbb18977b97b576..34e8e7d13b7b31bd028eeff5b4f2c8b76463f772 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1666,9 +1666,10 @@ void BrowserWindowGtk::SetGeometryHints() {
   // confused and maximizes the window, but doesn't set the
   // GDK_WINDOW_STATE_MAXIMIZED bit.  So instead, we keep track of whether to
   // maximize and call it after gtk_window_present.
-  show_state_after_show_ = chrome::GetSavedWindowShowState(browser_.get());
-
-  gfx::Rect bounds = chrome::GetSavedWindowBounds(browser_.get());
+  gfx::Rect bounds;
+  chrome::GetSavedWindowBoundsAndShowState(browser_.get(),
+                                           &bounds,
+                                           &show_state_after_show_);
   // We don't blindly call SetBounds here: that sets a forced position
   // on the window and we intentionally *don't* do that for normal
   // windows.  Most programs do not restore their window position on