Combined window positioning and show state determiniation in the WindowSizer

chrome/browser/prefs/pref_service_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/gfx/rect.h"
 
+#if defined(USE_AURA)

[sky, 2012/10/08 21:01:25]

This shouldn't be needed.

[Mr4D (OOO till 08-26), 2012/10/08 23:04:27]

Right - not anymore! Done.

+#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.
 #if !defined(TOOLKIT_GTK)
 
 typedef InProcessBrowserTest PreservedWindowPlacement;
 
 IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
   browser()->window()->SetBounds(gfx::Rect(20, 30, 400, 500));
 }
@@ skipping 99 matching lines @@
   EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".left",
       &left));
   EXPECT_EQ(left, bounds.x());
 
   int right = 0;
   EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".right",
       &right));
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
   // Find if launched window is maximized.
-  bool is_window_maximized =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_MAXIMIZED;
+  bool is_window_maximized = browser()->window()->IsMaximized();
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 
 class PreservedWindowPlacementIsMigrated : public PreferenceServiceTest {
@@ skipping 37 matching lines @@
   EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".left",
       &left));
   EXPECT_EQ(left, bounds.x());
 
   int right = 0;
   EXPECT_TRUE(root_dict->GetInteger(kBrowserWindowPlacement + ".right",
       &right));
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
   // Find if launched window is maximized.
-  bool is_window_maximized =
-      chrome::GetSavedWindowShowState(browser()) == ui::SHOW_STATE_MAXIMIZED;
+  bool is_window_maximized = browser()->window()->IsMaximized();
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif