[Cleanup] Rename WindowSettings to WindowState

ash/wm/toplevel_window_event_handler_unittest.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 "ash/wm/toplevel_window_event_handler.h"
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/lock_state_controller_impl2.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow.h"
 #include "ash/wm/resize_shadow_controller.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
@@ skipping 405 matching lines @@
   target->SetBounds(bounds_before_maximization);
   old_bounds = target->bounds();
 
   // Maximize.
   end = location = target->GetBoundsInRootWindow().CenterPoint();
   end.Offset(0, -100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
+
+  wm::WindowState* window_state = wm::GetWindowState(target.get());
   EXPECT_NE(old_bounds.ToString(), target->bounds().ToString());
-  EXPECT_TRUE(wm::IsWindowMaximized(target.get()));
+  EXPECT_TRUE(window_state->IsMaximized());
   EXPECT_EQ(old_bounds.ToString(),
-            GetRestoreBoundsInScreen(target.get())->ToString());
+            window_state->GetRestoreBoundsInScreen().ToString());
 
-  wm::RestoreWindow(target.get());
+  window_state->Restore();
   target->SetBounds(old_bounds);
 
   // Minimize.
   end = location = target->GetBoundsInRootWindow().CenterPoint();
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), target->bounds().ToString());
-  EXPECT_TRUE(wm::IsWindowMinimized(target.get()));
-  EXPECT_TRUE(GetWindowAlwaysRestoresToRestoreBounds(target.get()));
+  EXPECT_TRUE(window_state->IsMinimized());
+  EXPECT_TRUE(window_state->always_restores_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
-            GetRestoreBoundsInScreen(target.get())->ToString());
+            window_state->GetRestoreBoundsInScreen().ToString());
 }
 
 // Tests that a gesture cannot minimize a window in login/lock screen.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) {
   LockStateControllerImpl2* state_controller =
       static_cast<LockStateControllerImpl2*>
           (Shell::GetInstance()->lock_state_controller());
   state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
   state_controller->OnLockStateChanged(false);
   SetUserLoggedIn(false);
 
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
   aura::Window* lock = internal::RootWindowController::ForWindow(target.get())->
       GetContainer(internal::kShellWindowId_LockSystemModalContainer);
   lock->AddChild(target.get());
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
 
   gfx::Point end = location;
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
-  EXPECT_FALSE(wm::IsWindowMinimized(target.get()));
+  EXPECT_FALSE(wm::GetWindowState(target.get())->IsMinimized());
 }
 
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragToRestore) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithDelegate(
           new TestWindowDelegate(HTCAPTION),
           0,
           gfx::Rect(10, 20, 30, 40)));
   window->Show();
-  ash::wm::ActivateWindow(window.get());
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  window_state->Activate();
 
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        window.get());
   gfx::Rect old_bounds = window->bounds();
   gfx::Point location, end;
   end = location = window->GetBoundsInRootWindow().CenterPoint();
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), window->bounds().ToString());
-  EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
-  EXPECT_TRUE(GetWindowAlwaysRestoresToRestoreBounds(window.get()));
+  EXPECT_TRUE(window_state->IsMinimized());
+  EXPECT_TRUE(window_state->always_restores_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
-            GetRestoreBoundsInScreen(window.get())->ToString());
+            window_state->GetRestoreBoundsInScreen().ToString());
 }
 
 // Tests that an unresizable window cannot be dragged or snapped using gestures.
 TEST_F(ToplevelWindowEventHandlerTest, GestureDragForUnresizableWindow) {
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
 
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
@@ skipping 123 matching lines @@
   // Once window is minimized, window dragging completes.
   {
     scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
     target->Focus();
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          target.get());
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
-
-    wm::MinimizeWindow(target.get());
-    wm::RestoreWindow(target.get());
+    wm::WindowState* window_state = wm::GetWindowState(target.get());
+    window_state->Minimize();
+    window_state->Restore();
 
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
   }
 
   // Once window is maximized, window dragging completes.
   {
     scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
     target->Focus();
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          target.get());
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
-
-    wm::MaximizeWindow(target.get());
-    wm::RestoreWindow(target.get());
+    wm::WindowState* window_state = wm::GetWindowState(target.get());
+    window_state->Maximize();
+    window_state->Restore();
 
     generator.PressLeftButton();
     generator.MoveMouseBy(10, 11);
     RunAllPendingInMessageLoop();
     EXPECT_EQ("10,11 100x100", target->bounds().ToString());
   }
 }
 
 // Test class for mouse and touch resize shadow tests.
 class ToplevelWindowEventHandlerResizeTest
@@ skipping 116 matching lines @@
 
   // Move mouse out of the window. Shadows should disappear.
   generator.MoveMouseTo(150, 150);
   EXPECT_FALSE(HasResizeShadow());
 
   RunAllPendingInMessageLoop();
 }
 
 }  // namespace test
 }  // namespace ash