[Cleanup] Rename WindowSettings to WindowState

ash/wm/window_cycle_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/wm/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_cycle_list.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 153 matching lines @@
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window2.get()));
 }
 
 // Cycles between a maximized and normal window.
 TEST_F(WindowCycleControllerTest, MaximizedWindow) {
   // Create a couple of test windows.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
-
-  wm::MaximizeWindow(window1.get());
-  wm::ActivateWindow(window1.get());
-  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+  wm::WindowState* window1_state = wm::GetWindowState(window1.get());
+  window1_state->Maximize();
+  window1_state->Activate();
+  EXPECT_TRUE(window1_state->IsActive());
 
   // Rotate focus, this should move focus to window0.
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
-  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+  EXPECT_TRUE(wm::GetWindowState(window0.get())->IsActive());
 
   // One more time.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
-  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+  EXPECT_TRUE(window1_state->IsActive());
 }
 
 // Cycles to a minimized window.
 TEST_F(WindowCycleControllerTest, Minimized) {
   // Create a couple of test windows.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
+  wm::WindowState* window0_state = wm::GetWindowState(window0.get());
+  wm::WindowState* window1_state = wm::GetWindowState(window1.get());
 
-  wm::MinimizeWindow(window1.get());
-  wm::ActivateWindow(window0.get());
-  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+  window1_state->Minimize();
+  window0_state->Activate();
+  EXPECT_TRUE(window0_state->IsActive());
 
   // Rotate focus, this should move focus to window1 and unminimize it.
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
-  EXPECT_FALSE(wm::IsWindowMinimized(window1.get()));
-  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+  EXPECT_FALSE(window1_state->IsMinimized());
+  EXPECT_TRUE(window1_state->IsActive());
 
   // One more time back to w0.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
-  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+  EXPECT_TRUE(window0_state->IsActive());
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopWindow) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
@@ skipping 199 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace
 
 }  // namespace ash