Improving window auto management between workspaces

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_ASH)
+#include "ash/wm/window_util.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) {
+#if defined(USE_ASH)
+  // The window needs to be tagged as user positioned, otherwise it would get
+  // re-positioned.
+  ash::wm::SetUserHasChangedWindowPositionOrSize(
+      browser()->window()->GetNativeWindow(),
+      true);
+#endif
   browser()->window()->SetBounds(gfx::Rect(20, 30, 400, 500));
 }
 
 IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, Test) {
   gfx::Rect bounds = browser()->window()->GetBounds();
-
+#if defined(USE_ASH)
+  EXPECT_TRUE(ash::wm::HasUserChangedWindowPositionOrSize(
+                  browser()->window()->GetNativeWindow()));
+#endif
   gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500));
-  ASSERT_EQ(expected_bounds, bounds);
+  ASSERT_EQ(expected_bounds.ToString(), bounds.ToString());
 }
 
 #endif  // defined(TOOLKIT_GTK)
 
 class PreferenceServiceTest : public InProcessBrowserTest {
  public:
   explicit PreferenceServiceTest(bool new_profile) : new_profile_(new_profile) {
   }
 
   virtual bool SetUpUserDataDirectory() OVERRIDE {
@@ skipping 148 matching lines @@
   EXPECT_EQ(right, bounds.x() + bounds.width());
 
   // Find if launched window is 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