ESC accelerator and consistent overview mode for Athena homecard

athena/wm/window_manager_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 "athena/wm/public/window_manager.h"
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/test/base/athena_test_base.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/split_view_controller.h"
@@ skipping 39 matching lines @@
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
   EXPECT_EQ(gfx::Screen::GetNativeScreen()
                 ->GetPrimaryDisplay()
                 .work_area()
                 .size()
                 .ToString(),
             first->bounds().size().ToString());
   EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 
   // Tests that going into overview mode does not change the window bounds.
-  WindowManager::Get()->ToggleOverview();
+  WindowManager::Get()->ActivateOverview(true);
   ASSERT_TRUE(WindowManager::Get()->IsOverviewModeActive());
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
   EXPECT_EQ(gfx::Screen::GetNativeScreen()
                 ->GetPrimaryDisplay()
                 .work_area()
                 .size()
                 .ToString(),
             first->bounds().size().ToString());
   EXPECT_TRUE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
 
   // Terminate overview mode. |first| should be hidden, since it's not visible
   // to the user anymore.
-  WindowManager::Get()->ToggleOverview();
+  WindowManager::Get()->ActivateOverview(false);
   ASSERT_FALSE(WindowManager::Get()->IsOverviewModeActive());
   EXPECT_FALSE(first->IsVisible());
   EXPECT_TRUE(second->IsVisible());
 }
 
 TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
   wm::ActivateWindow(w3.get());
 
-  WindowManager::Get()->ToggleOverview();
+  WindowManager::Get()->ActivateOverview(true);
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 
   // Go into split-view mode.
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectSplitViewWindow(w3.get(), NULL, w3.get());
   EXPECT_TRUE(w3->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_FALSE(w1->IsVisible());
 }
 
 TEST_F(WindowManagerTest, NewWindowFromOverview) {
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
 
-  WindowManager::Get()->ToggleOverview();
+  WindowManager::Get()->ActivateOverview(true);
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
 
   // Test that opening a new window exits overview mode. The new window could
   // have been opened by JavaScript or by the home card.
   scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
 
   ASSERT_FALSE(WindowManager::Get()->IsOverviewModeActive());
   EXPECT_TRUE(w3->IsVisible());
   EXPECT_TRUE(wm::IsActiveWindow(w3.get()));
@@ skipping 183 matching lines @@
       wm_api.GetSplitViewController()->left_window()->bounds();
   EXPECT_NE(work_area.ToString(),
             left_bounds.size().ToString());
 
   // A new window should replace the left window when in split view.
   scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
 }
 
+TEST_F(WindowManagerTest, OverviewModeAccelerators) {
+  ui::test::EventGenerator generator(root_window());
+
+  // F6 toggles overview mode
+  ASSERT_FALSE(WindowManager::Get()->IsOverviewModeActive());
+  generator.PressKey(ui::VKEY_F6, ui::EF_NONE);
+  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
+  generator.PressKey(ui::VKEY_F6, ui::EF_NONE);
+  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
+
+  // ESC exits overview mode
+  generator.PressKey(ui::VKEY_F6, ui::EF_NONE);
+  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
+  generator.PressKey(ui::VKEY_ESCAPE, ui::EF_NONE);
+  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
+}
+
 TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
 
   // Splitview mode needs at least two windows.
   wm_api.wm()->ToggleSplitView();
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
@@ skipping 19 matching lines @@
 TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
   scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
 
   // Get into split-view mode, and then turn on overview mode.
   wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
-  WindowManager::Get()->ToggleOverview();
+  WindowManager::Get()->ActivateOverview(true);
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());
   EXPECT_EQ(w2.get(), wm_api.GetSplitViewController()->right_window());
 
   WindowOverviewModeDelegate* overview_delegate = wm_api.wm();
   overview_delegate->OnSelectWindow(w1.get());
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_TRUE(w1->IsVisible());
   // Make sure the windows that were in split-view mode are hidden.
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 }
 
 }  // namespace athena