[Cleanup] Rename WindowSettings to WindowState

ash/accelerators/accelerator_controller_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/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/volume_control_delegate.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/base/x/x11_util.h"
@@ skipping 461 matching lines @@
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_a));
 }
 
 TEST_F(AcceleratorControllerTest, WindowSnap) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   const ui::Accelerator dummy;
 
-  wm::ActivateWindow(window.get());
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+
+  window_state->Activate();
 
   {
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     gfx::Rect snap_left = window->bounds();
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_left.ToString());
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_left.ToString());
 
     // It should cycle back to the first snapped position.
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     EXPECT_EQ(window->bounds().ToString(), snap_left.ToString());
   }
   {
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     gfx::Rect snap_right = window->bounds();
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_right.ToString());
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_right.ToString());
 
     // It should cycle back to the first snapped position.
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_EQ(window->bounds().ToString(), snap_right.ToString());
   }
   {
     gfx::Rect normal_bounds = window->bounds();
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
-    EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
+    EXPECT_TRUE(window_state->IsMaximized());
     EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
-    EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
+    EXPECT_FALSE(window_state->IsMaximized());
     EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
-    EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
+    EXPECT_FALSE(window_state->IsMaximized());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
-    EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
+    EXPECT_FALSE(window_state->IsMaximized());
 
     GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
-    EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
+    EXPECT_TRUE(window_state->IsMaximized());
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
-    EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
-    EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
-    wm::RestoreWindow(window.get());
-    wm::ActivateWindow(window.get());
+    EXPECT_FALSE(window_state->IsMaximized());
+    EXPECT_TRUE(window_state->IsMinimized());
+    window_state->Restore();
+    window_state->Activate();
   }
   {
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
-    EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
+    EXPECT_TRUE(window_state->IsMinimized());
   }
 }
 
 TEST_F(AcceleratorControllerTest, ControllerContext) {
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   ui::Accelerator accelerator_a2(ui::VKEY_A, ui::EF_NONE);
   ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
 
   accelerator_a.set_type(ui::ET_KEY_PRESSED);
   accelerator_a2.set_type(ui::ET_KEY_RELEASED);
@@ skipping 24 matching lines @@
             GetController()->context()->previous_accelerator().type());
 }
 
 TEST_F(AcceleratorControllerTest, SuppressToggleMaximized) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   wm::ActivateWindow(window.get());
   const ui::Accelerator accelerator(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator empty_accelerator;
 
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+
   // Toggling not suppressed.
   GetController()->context()->UpdateContext(accelerator);
   GetController()->PerformAction(TOGGLE_MAXIMIZED, accelerator);
-  EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
+  EXPECT_TRUE(window_state->IsMaximized());
 
   // The same accelerator - toggling suppressed.
   GetController()->context()->UpdateContext(accelerator);
   GetController()->PerformAction(TOGGLE_MAXIMIZED, accelerator);
-  EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
+  EXPECT_TRUE(window_state->IsMaximized());
 
   // Suppressed but not for gesture events.
   GetController()->PerformAction(TOGGLE_MAXIMIZED, empty_accelerator);
-  EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
+  EXPECT_FALSE(window_state->IsMaximized());
 }
 
 #if defined(OS_WIN) || defined(USE_X11)
 TEST_F(AcceleratorControllerTest, ProcessOnce) {
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
 
   // The accelerator is processed only once.
 #if defined(OS_WIN)
@@ skipping 707 matching lines @@
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash