[Athena] Fix switching activities by swiping from the right bezel

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 9bcb5b8906a199207f9035e2f95fdbdb5d531a52..04ddf40a93fc988742d53b6305fee1324cf61cec 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -26,9 +26,11 @@ class WindowManagerTest : public test::AthenaTestBase {
   WindowManagerTest() {}
   virtual ~WindowManagerTest() {}
 
-  scoped_ptr<aura::Window> CreateAndShowWindow(aura::WindowDelegate* delegate) {
+  scoped_ptr<aura::Window> CreateAndActivateWindow(
+      aura::WindowDelegate* delegate) {
     scoped_ptr<aura::Window> window(CreateTestWindow(delegate, gfx::Rect()));
     window->Show();
+    wm::ActivateWindow(window.get());
     return window.Pass();
   }
 
@@ -38,8 +40,8 @@ class WindowManagerTest : public test::AthenaTestBase {
 
 TEST_F(WindowManagerTest, OverviewModeBasics) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
   wm::ActivateWindow(second.get());
@@ -79,9 +81,9 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> w3(CreateAndShowWindow(&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::GetInstance()->ToggleOverview();
@@ -99,8 +101,8 @@ TEST_F(WindowManagerTest, OverviewToSplitViewMode) {
 
 TEST_F(WindowManagerTest, NewWindowFromOverview) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
 
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_TRUE(w1->IsVisible());
@@ -108,7 +110,7 @@ TEST_F(WindowManagerTest, NewWindowFromOverview) {
 
   // 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(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> w3(CreateAndActivateWindow(&delegate));
 
   ASSERT_FALSE(WindowManager::GetInstance()->IsOverviewModeActive());
   EXPECT_TRUE(w3->IsVisible());
@@ -119,9 +121,9 @@ TEST_F(WindowManagerTest, NewWindowFromOverview) {
 
 TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
 
@@ -144,9 +146,9 @@ TEST_F(WindowManagerTest, BezelGestureToSplitViewMode) {
 
 TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
   first->Hide();
   second->Hide();
 
@@ -160,21 +162,32 @@ TEST_F(WindowManagerTest, BezelGestureToSwitchBetweenWindows) {
   const gfx::Point left_bezel_points[2] = {
       gfx::Point(2, 10), gfx::Point(4, 20),
   };
-  const int kEventTimeSepration = 16;
+  const int kEventTimeSeparation = 16;
   int width = root_window()->bounds().width();
   generator.GestureMultiFingerScroll(
-      2, left_bezel_points, kEventTimeSepration, 1, width, 0);
+      2, left_bezel_points, kEventTimeSeparation, 1, width, 0);
   EXPECT_TRUE(wm::IsActiveWindow(second.get()));
   EXPECT_EQ(second.get(),
             wm_api.GetWindowListProvider()->GetWindowList().back());
+
+  // Do a two-finger swipe from the right bezel.
+  const gfx::Point right_bezel_points[2] = {
+      gfx::Point(width - 5, 10),
+      gfx::Point(width - 10, 20)
+  };
+  generator.GestureMultiFingerScroll(
+      2, right_bezel_points, kEventTimeSeparation, 1, -width, 0);
+  EXPECT_TRUE(wm::IsActiveWindow(third.get()));
+  EXPECT_EQ(third.get(),
+            wm_api.GetWindowListProvider()->GetWindowList().back());
 }
 
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
 
@@ -219,10 +232,10 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindows) {
 TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> third(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> fourth(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
+  scoped_ptr<aura::Window> fourth(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
 
@@ -262,13 +275,13 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
   EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
   windows = wm_api.GetWindowListProvider()->GetWindowList();
   ASSERT_EQ(4u, windows.size());
-  EXPECT_EQ(second.get(), windows[3]);
-  EXPECT_EQ(third.get(), windows[2]);
+  EXPECT_EQ(third.get(), windows[3]);
+  EXPECT_EQ(second.get(), windows[2]);
 }
 
 TEST_F(WindowManagerTest, NewWindowBounds) {
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> first(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> first(CreateAndActivateWindow(&delegate));
 
   test::WindowManagerImplTestApi wm_api;
   // The window should have the same size as the container.
@@ -279,18 +292,18 @@ TEST_F(WindowManagerTest, NewWindowBounds) {
   EXPECT_TRUE(first->bounds().origin().IsOrigin());
 
   // A second window should have the same bounds as the first one.
-  scoped_ptr<aura::Window> second(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> second(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(first->bounds().ToString(), second->bounds().ToString());
 
   // Get into split view.
-  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL);
+  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
   const gfx::Rect left_bounds =
       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(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> third(CreateAndActivateWindow(&delegate));
   EXPECT_EQ(wm_api.GetSplitViewController()->left_window(), third.get());
   EXPECT_EQ(left_bounds.ToString(), third->bounds().ToString());
 }
@@ -299,21 +312,16 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateTestWindow(&delegate, gfx::Rect()));
-  w1->Show();
-
-  ui::test::EventGenerator generator(root_window());
+  scoped_ptr<aura::Window> w1(CreateAndActivateWindow(&delegate));
 
   // Splitview mode needs at least two windows.
-  generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);

[pkotwicz, 2014/09/19 21:58:00]

The accelerator does not work anymore because the |w1| is activated. 
Making |w1| a views::Widget (which has a views::FocusManager) instead of an
aura::Window makes the accelerator work.

Calling WindowManagerImpl::ToggleSplitView() makes most sense in my opinion

-  generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+  wm_api.wm()->ToggleSplitView();
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
-  scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
+  scoped_ptr<aura::Window> w2(CreateAndActivateWindow(&delegate));
   w2->Show();
 
-  generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
-  generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+  wm_api.wm()->ToggleSplitView();
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   int width =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area().width();
@@ -322,8 +330,7 @@ TEST_F(WindowManagerTest, SplitModeActivationByShortcut) {
   EXPECT_EQ(width / 2, w2->bounds().width());
 
   // Toggle back to normal mode.
-  generator.PressKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
-  generator.ReleaseKey(ui::VKEY_F6, ui::EF_CONTROL_DOWN);
+  wm_api.wm()->ToggleSplitView();
   EXPECT_FALSE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
 
   EXPECT_EQ(width, w1->bounds().width());
@@ -334,12 +341,12 @@ TEST_F(WindowManagerTest, OverviewModeFromSplitMode) {
   test::WindowManagerImplTestApi wm_api;
 
   aura::test::TestWindowDelegate delegate;
-  scoped_ptr<aura::Window> w1(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> w2(CreateAndShowWindow(&delegate));
-  scoped_ptr<aura::Window> w3(CreateAndShowWindow(&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);
+  wm_api.GetSplitViewController()->ActivateSplitMode(NULL, NULL, NULL);
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_TRUE(wm_api.GetSplitViewController()->IsSplitViewModeActive());
   EXPECT_EQ(w3.get(), wm_api.GetSplitViewController()->left_window());