ESC accelerator and consistent overview mode for Athena homecard

athena/wm/window_manager_unittest.cc

Index: athena/wm/window_manager_unittest.cc
diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
index e6d1e7e5411ed3295a98d95500ed8ef955ffb766..4adbb6e1c04389909fdf1b05e739906e2110bad6 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -57,7 +57,7 @@ TEST_F(WindowManagerTest, OverviewModeBasics) {
   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()
@@ -71,7 +71,7 @@ TEST_F(WindowManagerTest, OverviewModeBasics) {
 
   // 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());
@@ -86,7 +86,7 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   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());
@@ -104,7 +104,7 @@ TEST_F(WindowManagerTest, NewWindowFromOverview) {
   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());
 
@@ -308,6 +308,23 @@ TEST_F(WindowManagerTest, NewWindowBounds) {
   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;
 
@@ -347,7 +364,7 @@ TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
 
   // 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());