Revert "Enable ash window cycle UI by default."

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/aura/wm_window_aura.h"
@@ skipping 60 matching lines @@
 
 class WindowCycleControllerTest : public test::AshTestBase {
  public:
   WindowCycleControllerTest() {}
   ~WindowCycleControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     ASSERT_TRUE(test::TestShelfDelegate::instance());
 
-    WindowCycleList::DisableInitialDelayForTesting();
-
     shelf_view_test_.reset(new test::ShelfViewTestAPI(
         test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view()));
     shelf_view_test_->SetAnimationDuration(1);
   }
 
   aura::Window* CreatePanelWindow() {
     gfx::Rect rect(100, 100);
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL, ui::wm::WINDOW_TYPE_PANEL, 0, rect);
     test::TestShelfDelegate::instance()->AddShelfItem(window);
@@ skipping 75 matching lines @@
   // Pressing and releasing Alt-tab again should cycle back to the most-
   // recently-used window in the current child order.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->StopCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Pressing Alt-tab multiple times without releasing Alt should cycle through
   // all the windows and wrap around.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(controller->IsCycling());
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(controller->IsCycling());
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(controller->IsCycling());
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   controller->StopCycling();
   EXPECT_FALSE(controller->IsCycling());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Reset our stacking order.
   wm::ActivateWindow(window2.get());
   wm::ActivateWindow(window1.get());
   wm::ActivateWindow(window0.get());
 
-  // Likewise we can cycle backwards through the windows.
+  // Likewise we can cycle backwards through all the windows.
   controller->HandleCycleWindow(WindowCycleController::BACKWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
   controller->HandleCycleWindow(WindowCycleController::BACKWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+  controller->HandleCycleWindow(WindowCycleController::BACKWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->StopCycling();
-  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
-
-  // Reset our stacking order.
-  wm::ActivateWindow(window2.get());
-  wm::ActivateWindow(window1.get());
-  wm::ActivateWindow(window0.get());
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // When the screen is locked, cycling window does not take effect.
   WmShell::Get()->GetSessionStateDelegate()->LockScreen();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  EXPECT_FALSE(controller->IsCycling());
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+  controller->HandleCycleWindow(WindowCycleController::BACKWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
-  // Unlock, it works again.
   WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  controller->StopCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 
   // When a modal window is active, cycling window does not take effect.
   aura::Window* modal_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(), kShellWindowId_SystemModalContainer);
   std::unique_ptr<Window> modal_window(
       CreateTestWindowWithId(-2, modal_container));
   modal_window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
   wm::ActivateWindow(modal_window.get());
   EXPECT_TRUE(wm::IsActiveWindow(modal_window.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(modal_window.get()));
-  EXPECT_FALSE(controller->IsCycling());
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window2.get()));
   controller->HandleCycleWindow(WindowCycleController::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(modal_window.get()));
-  EXPECT_FALSE(controller->IsCycling());
   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.
   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();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  controller->StopCycling();
   EXPECT_TRUE(wm::GetWindowState(window0.get())->IsActive());
-  EXPECT_FALSE(window1_state->IsActive());
 
   // One more time.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  controller->StopCycling();
   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();
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  controller->StopCycling();
-  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->StopCycling();
   EXPECT_TRUE(window0_state->IsActive());
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopWindow) {
   WindowCycleController* controller = WmShell::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->StopCycling();
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+
+  controller->StopCycling();
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultiWindow) {
   WindowCycleController* controller = WmShell::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());
 
   // 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(4u, GetWindows(controller).size());
   EXPECT_EQ(window0.get(), GetWindows(controller)[0]);
   EXPECT_EQ(window3.get(), GetWindows(controller)[1]);
   EXPECT_EQ(window2.get(), GetWindows(controller)[2]);
   EXPECT_EQ(window1.get(), GetWindows(controller)[3]);
+
+  controller->StopCycling();
+  EXPECT_TRUE(wm::IsActiveWindow(window3.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+
+  controller->StopCycling();
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window3.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
   if (!SupportsMultipleDisplays())
     return;
 
   // Set up a second root window
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
@@ skipping 30 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
 
   // Window lists should return the topmost window in front.
   ASSERT_TRUE(controller->window_cycle_list());
   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->StopCycling();
+  EXPECT_TRUE(wm::IsActiveWindow(window3.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  controller->StopCycling();
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window3.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 }
 
 TEST_F(WindowCycleControllerTest, MostRecentlyUsed) {
   WindowCycleController* controller = WmShell::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()));
   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]);
 
-  // Cycling through then stopping the cycling will activate a window.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   controller->StopCycling();
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 
-  // Cycling alone (without StopCycling()) doesn't activate.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
-
-  // Showing the Alt+Tab UI does however deactivate the erstwhile active window.
-  EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   controller->StopCycling();
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  controller->HandleCycleWindow(WindowCycleController::FORWARD);
+  EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 // Tests that beginning window selection hides the app list.
 TEST_F(WindowCycleControllerTest, SelectingHidesAppList) {
   WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   WmShell::Get()->ShowAppList();
   EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
-
-  // 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()));
 }
 
-// Tests that cycling through windows doesn't change their minimized state.
+// Tests that cycling through windows shows and minimizes windows as they
+// are passed.
 TEST_F(WindowCycleControllerTest, CyclePreservesMinimization) {
   WindowCycleController* controller = WmShell::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()));
+  EXPECT_FALSE(IsWindowMinimized(window1.get()));
 
   // Back on window 1.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   controller->StopCycling();
 
   EXPECT_TRUE(IsWindowMinimized(window1.get()));
 }
 
@@ skipping 92 matching lines @@
   generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
   EXPECT_EQ(0u, key_count.GetCountAndReset());
   generator.ReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
   EXPECT_EQ(0u, key_count.GetCountAndReset());
   generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE);
   EXPECT_TRUE(wm::GetWindowState(w1.get())->IsActive());
   EXPECT_EQ(0u, key_count.GetCountAndReset());
 }
 
 }  // namespace ash