Combined window positioning and show state determiniation in the WindowSizer

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 1648 matching lines @@
 
 void BrowserWindowGtk::QueueToolbarRedraw() {
   gtk_widget_queue_draw(toolbar_->widget());
 }
 
 void BrowserWindowGtk::SetGeometryHints() {
   // If we call gtk_window_maximize followed by gtk_window_present, compiz gets
   // 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
   // Linux, instead letting the window manager choose a position.
   //
   // However, in cases like dropping a tab where the bounds are
   // specifically set, we do want to position explicitly.  We also
   // force the position as part of session restore, as applications
   // that restore other, similar state (for instance GIMP, audacity,
   // pidgin, dia, and gkrellm) do tend to restore their positions.
@@ skipping 735 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }