Promotes more accessors from WmShell to Shell

ash/wm/window_cycle_controller_unittest.cc

 // Copyright 2014 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/common/wm/window_cycle_controller.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/focus_cycler.h"
@@ skipping 94 matching lines @@
     test::TestShelfDelegate::instance()->AddShelfItem(WmWindow::Get(window));
     shelf_view_test_->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
   const aura::Window::Windows GetWindows(WindowCycleController* controller) {
     return WmWindow::ToAuraWindows(controller->window_cycle_list()->windows());
   }
 
   const views::Widget* GetWindowCycleListWidget() const {
-    return WmShell::Get()
+    return Shell::Get()
         ->window_cycle_controller()
         ->window_cycle_list()
         ->widget();
   }
 
  private:
   std::unique_ptr<test::ShelfViewTestAPI> shelf_view_test_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowCycleControllerTest);
 };
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindowBaseCases) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Cycling doesn't crash if there are no windows.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycling works for a single window, even though nothing changes.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 // Verifies if there is only one window and it isn't active that cycling
 // activates it.
 TEST_F(WindowCycleControllerTest, SingleWindowNotActive) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Create a single test window.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Rotate focus, this should move focus to another window that isn't part of
   // the default container.
   Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
 
   // Cycling should activate the window.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindow) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.  Create them in reverse
   // order so they are stacked 0 over 1 over 2.
   std::unique_ptr<Window> window2(CreateTestWindowInShellWithId(2));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
@@ skipping 91 matching lines @@
 TEST_F(WindowCycleControllerTest, MaximizedWindow) {
   // Create a couple of test windows.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   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 = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::GetWindowState(window0.get())->IsActive());
   EXPECT_FALSE(window1_state->IsActive());
 
   // One more time.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(window1_state->IsActive());
 }
 
 // Cycles to a minimized window.
 TEST_F(WindowCycleControllerTest, Minimized) {
   // Create a couple of test windows.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   wm::WindowState* window0_state = wm::GetWindowState(window0.get());
   wm::WindowState* window1_state = wm::GetWindowState(window1.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 = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_FALSE(window0_state->IsActive());
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsActive());
 
   // One more time back to w0.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(window0_state->IsActive());
 }
 
 // Tests that when all windows are minimized, cycling starts with the first one
 // rather than the second.
 TEST_F(WindowCycleControllerTest, AllAreMinimized) {
   // Create a couple of test windows.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   wm::WindowState* window0_state = wm::GetWindowState(window0.get());
   wm::WindowState* window1_state = wm::GetWindowState(window1.get());
 
   window0_state->Minimize();
   window1_state->Minimize();
 
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(window0_state->IsActive());
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsMinimized());
 
   // But it's business as usual when cycling backwards.
   window0_state->Minimize();
   window1_state->Minimize();
   controller->HandleCycleWindow(WindowCycleController::BACKWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(window0_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsActive());
   EXPECT_FALSE(window1_state->IsMinimized());
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopWindow) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   Window* top_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_AlwaysOnTopContainer);
   std::unique_ptr<Window> window2(CreateTestWindowWithId(2, top_container));
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
 
   // Window lists should return the topmost window in front.
   ASSERT_TRUE(controller->window_cycle_list());
   ASSERT_EQ(3u, GetWindows(controller).size());
   EXPECT_EQ(window0.get(), GetWindows(controller)[0]);
   EXPECT_EQ(window2.get(), GetWindows(controller)[1]);
   EXPECT_EQ(window1.get(), GetWindows(controller)[2]);
 
   controller->CompleteCycling();
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultiWindow) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   Window* top_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_AlwaysOnTopContainer);
   std::unique_ptr<Window> window2(CreateTestWindowWithId(2, top_container));
   std::unique_ptr<Window> window3(CreateTestWindowWithId(3, top_container));
   wm::ActivateWindow(window0.get());
@@ skipping 12 matching lines @@
 
   controller->CompleteCycling();
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
   // Set up a second root window
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Create two windows in the primary root.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   EXPECT_EQ(root_windows[0], window0->GetRootWindow());
   Window* top_container0 =
       Shell::GetContainer(root_windows[0], kShellWindowId_AlwaysOnTopContainer);
   std::unique_ptr<Window> window1(CreateTestWindowWithId(1, top_container0));
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
 
   // Move the active root window to the secondary root and create two windows.
@@ skipping 23 matching lines @@
   ASSERT_EQ(4u, GetWindows(controller).size());
   EXPECT_EQ(window2.get(), GetWindows(controller)[0]);
   EXPECT_EQ(window3.get(), GetWindows(controller)[1]);
   EXPECT_EQ(window1.get(), GetWindows(controller)[2]);
   EXPECT_EQ(window0.get(), GetWindows(controller)[3]);
 
   controller->CompleteCycling();
 }
 
 TEST_F(WindowCycleControllerTest, MostRecentlyUsed) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
   std::unique_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<Window> window1(CreateTestWindowInShellWithId(1));
   std::unique_ptr<Window> window2(CreateTestWindowInShellWithId(2));
 
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
@@ skipping 23 matching lines @@
 
 // Tests that beginning window selection hides the app list.
 TEST_F(WindowCycleControllerTest, SelectingHidesAppList) {
   // TODO: fails in mash because of AppListPresenter. http://crbug.com/696028.
   if (WmShell::Get()->IsRunningInMash())
     return;
 
   // The tested behavior relies on the app list presenter implementation.
   test::TestAppListViewPresenterImpl app_list_presenter_impl;
 
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   app_list_presenter_impl.Show(display_manager()->first_display_id());
   EXPECT_TRUE(app_list_presenter_impl.IsVisible());
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_FALSE(app_list_presenter_impl.IsVisible());
 
   // Make sure that dismissing the app list this way doesn't pass activation
   // to a different window.
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
 
   controller->CompleteCycling();
 }
 
 // Tests that cycling through windows doesn't change their minimized state.
 TEST_F(WindowCycleControllerTest, CyclePreservesMinimization) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   wm::ActivateWindow(window1.get());
   wm::GetWindowState(window1.get())->Minimize();
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   // On window 2.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   // Back on window 1.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   controller->CompleteCycling();
 
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 }
 
 // Tests cycles between panel and normal windows.
 TEST_F(WindowCycleControllerTest, CyclePanels) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> panel0(CreatePanelWindow());
   std::unique_ptr<aura::Window> panel1(CreatePanelWindow());
   wm::ActivateWindow(window0.get());
   wm::ActivateWindow(panel1.get());
   wm::ActivateWindow(panel0.get());
   EXPECT_TRUE(wm::IsActiveWindow(panel0.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::IsActiveWindow(panel1.get()));
 
   // Cycling again should select the most recently used panel.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::IsActiveWindow(panel0.get()));
 
   // Cycling twice again should select the first window.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 // Tests cycles between panel and normal windows.
 TEST_F(WindowCycleControllerTest, CyclePanelsDestroyed) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   std::unique_ptr<aura::Window> window2(CreateTestWindowInShellWithId(2));
   std::unique_ptr<aura::Window> panel0(CreatePanelWindow());
   std::unique_ptr<aura::Window> panel1(CreatePanelWindow());
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(panel1.get());
   wm::ActivateWindow(panel0.get());
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycling once highlights window2.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   // All panels are destroyed.
   panel0.reset();
   panel1.reset();
   // Cycling again should now select window2.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->CompleteCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 }
 
 // Tests cycles between panel and normal windows.
 TEST_F(WindowCycleControllerTest, CycleMruPanelDestroyed) {
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   std::unique_ptr<aura::Window> panel0(CreatePanelWindow());
   std::unique_ptr<aura::Window> panel1(CreatePanelWindow());
   wm::ActivateWindow(panel1.get());
   wm::ActivateWindow(panel0.get());
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
@@ skipping 50 matching lines @@
   w1->SetTargetHandler(&event_count);
   ui::test::EventGenerator& generator = GetEventGenerator();
   wm::ActivateWindow(w0.get());
 
   // Events get through.
   generator.MoveMouseToCenterOf(w0.get());
   generator.ClickLeftButton();
   EXPECT_LT(0, event_count.GetMouseEventCountAndReset());
 
   // Start cycling.
-  WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
+  WindowCycleController* controller = Shell::Get()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
 
   // Most mouse events don't get through.
   generator.PressLeftButton();
   EXPECT_EQ(0, event_count.GetMouseEventCountAndReset());
 
   // Although releases do.
   generator.ReleaseLeftButton();
   EXPECT_LT(0, event_count.GetMouseEventCountAndReset());
 
@@ skipping 71 matching lines @@
     gfx::Rect second_display_bounds =
         display_manager()->GetDisplayAt(1).bounds();
     std::unique_ptr<Window> window0(
         CreateTestWindowInShellWithBounds(second_display_bounds));
     // Activate this window so that the secondary display becomes the one where
     // the Alt+Tab UI is shown.
     wm::ActivateWindow(window0.get());
     std::unique_ptr<Window> window1(
         CreateTestWindowInShellWithBounds(second_display_bounds));
 
-    WindowCycleController* controller =
-        WmShell::Get()->window_cycle_controller();
+    WindowCycleController* controller = Shell::Get()->window_cycle_controller();
     controller->HandleCycleWindow(WindowCycleController::FORWARD);
 
     const gfx::Rect bounds =
         GetWindowCycleListWidget()->GetWindowBoundsInScreen();
     EXPECT_TRUE(second_display_bounds.Contains(bounds));
     EXPECT_FALSE(
         display_manager()->GetDisplayAt(0).bounds().Intersects(bounds));
     const gfx::Rect display_relative_bounds =
         bounds - second_display_bounds.OffsetFromOrigin();
     // Base case sets the expectation for other cases.
     if (expected_bounds.IsEmpty())
       expected_bounds = display_relative_bounds;
     else
       EXPECT_EQ(expected_bounds, display_relative_bounds);
     controller->CompleteCycling();
   }
 }
 
 }  // namespace ash