wm: Allow double tap on overview button to quick switch.

ash/system/overview/overview_button_tray_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/system/overview/overview_button_tray.h"
 
 #include "ash/login_status.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
+#include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/test/user_action_tester.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
@@ skipping 70 matching lines @@
 TEST_F(OverviewButtonTrayTest, PerformAction) {
   ASSERT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
 
   // Overview Mode only works when there is a window
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(Shell::Get()->window_selector_controller()->IsSelecting());
+
+  // Verify tapping on the button again closes overview mode.
+  GetTray()->PerformAction(tap);
+  EXPECT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
+}
+
+TEST_F(OverviewButtonTrayTest, PerformDoubleTapAction) {
+  ASSERT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
+
+  // Verify that when we only have one active window, a double tap will act as a
+  // two single taps and open then close overview mode.

[sadrul, 2017/05/18 13:41:38]

I don't think this case is actually tested. Can you add this case, or remove the
comment?

[sammiequon, 2017/05/18 16:19:06]

Done.

+  std::unique_ptr<aura::Window> window1(
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+  wm::ActivateWindow(window1.get());

[James Cook, 2017/05/18 15:10:54]

Do you have to activate this one?

[sammiequon, 2017/05/18 16:19:06]

Nope. Removed.

+
+  // Add a secondary active window to test quick switch.
+  std::unique_ptr<aura::Window> window2(
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+  wm::ActivateWindow(window2.get());
+  EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
+
+  // Verify that after double tapping, we have switched to window 1.
+  ui::GestureEventDetails double_tap_details(ui::ET_GESTURE_TAP);
+  double_tap_details.set_tap_count(2);
+  ui::GestureEvent double_tap(0, 0, 0, base::TimeTicks(), double_tap_details);
+  GetTray()->PerformAction(double_tap);
+  EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
+  EXPECT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
+
+  // Verify that if we double tap on the window selection page, nothing happens
+  // and both windows are not the active window.
+  ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
+                       ui::GestureEventDetails(ui::ET_GESTURE_TAP));
+  GetTray()->PerformAction(tap);
+  ASSERT_TRUE(Shell::Get()->window_selector_controller()->IsSelecting());
+  GetTray()->PerformAction(double_tap);
+  EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
+  EXPECT_FALSE(wm::IsActiveWindow(window2.get()));
+  EXPECT_TRUE(Shell::Get()->window_selector_controller()->IsSelecting());

[James Cook, 2017/05/18 15:10:54]

Nice test - easy to read. I like the style of blocks of code with comments about
what you're doing.

[sammiequon, 2017/05/18 16:19:06]

Thanks :-).

 }
 
 // Tests that tapping on the control will record the user action Tray_Overview.
 TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
   // TODO: investigate failure in mash, http://crbug.com/698129.
   if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   ASSERT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
 
@@ skipping 134 matching lines @@
   ASSERT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(GetTray()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash