Combined window positioning and show state determiniation in the WindowSizer

chrome/browser/prefs/pref_service_browsertest.cc

Index: chrome/browser/prefs/pref_service_browsertest.cc
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index a49ab22900152c872f94ff4722f7b65153e16b41..d5333f14f82ecf2bb3e93612dab4602837dad17e 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -23,6 +23,10 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/gfx/rect.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
+#endif
+
 // On GTK, resizing happens asynchronously and we currently don't have a way to
 // get called back (it's probably possible, but we don't have that code). Since
 // the GTK code is going away, not spending more time on this.
@@ -141,13 +145,15 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsLoaded, Test) {
       &right));
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
+#if defined(USE_AURA)

[sky, 2012/10/08 15:25:17]

Why the ifdefs in this file?

[Mr4D (OOO till 08-26), 2012/10/08 17:39:18]

It was because of the "gtk" reference errors I've got when using
"GetNativeWindow". But thanks for the BaseWindow reference. Removed. Done.

   // Find if launched window is maximized.
   bool is_window_maximized =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_MAXIMIZED;
+      browser()->window()->GetNativeWindow()->IsMaximized();
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
+#endif
 }
 #endif
 
@@ -200,12 +206,14 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) {
       &right));
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
+#if defined(USE_AURA)
   // Find if launched window is maximized.
   bool is_window_maximized =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_MAXIMIZED;
+      browser()->window()->GetNativeWindow()->IsMaximized();
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
+#endif
 }
 #endif