Added multi-finger gestures to touch_exploration_controller

ui/chromeos/touch_exploration_controller.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 "ui/chromeos/touch_exploration_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/default_tick_clock.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 25 matching lines @@
     : root_window_(root_window),
       delegate_(delegate),
       state_(NO_FINGERS_DOWN),
       event_handler_for_testing_(NULL),
       gesture_provider_(this),
       prev_state_(NO_FINGERS_DOWN),
       VLOG_on_(true),
       tick_clock_(NULL) {
   CHECK(root_window);
   root_window->GetHost()->GetEventSource()->AddEventRewriter(this);
+  InitializeSwipeClosures();
 }
 
 TouchExplorationController::~TouchExplorationController() {
   root_window_->GetHost()->GetEventSource()->RemoveEventRewriter(this);
 }
 
 ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
     const ui::Event& event,
     scoped_ptr<ui::Event>* rewritten_event) {
   if (!event.IsTouchEvent()) {
@@ skipping 642 matching lines @@
 
 void TouchExplorationController::OnSwipeEvent(ui::GestureEvent* swipe_gesture) {
   // A swipe gesture contains details for the direction in which the swipe
   // occurred. TODO(evy) : Research which swipe results users most want and
   // remap these swipes to the best events. Hopefully in the near future
   // there will also be a menu for users to pick custom mappings.
   GestureEventDetails event_details = swipe_gesture->details();
   int num_fingers = event_details.touch_points();
   if(VLOG_on_)
     VLOG(0) << "\nSwipe with " << num_fingers << " fingers.";
+
   if (num_fingers > 4)
     return;
-  switch (num_fingers) {
-    case 1:
-      if (event_details.swipe_left()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_LEFT);
-        return;
-      } else if (event_details.swipe_right()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_RIGHT);
-        return;
-      } else if (event_details.swipe_up()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_UP);
-        return;
-      } else if (event_details.swipe_down()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_DOWN);
-        return;
-      }
-    case 2:
-      if (event_details.swipe_left()) {
-        DispatchKeyWithFlags(VKEY_BROWSER_BACK, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_right()) {
-        DispatchKeyWithFlags(VKEY_BROWSER_FORWARD, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_up()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_A);
-        return;
-      } else if (event_details.swipe_down()) {
-        DispatchShiftSearchKeyEvent(ui::VKEY_R);
-        return;
-      }
-    case 3:
-      if (event_details.swipe_left()) {
-        DispatchKeyWithFlags(ui::VKEY_TAB,
-                             ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
-      } else if (event_details.swipe_right()) {
-        DispatchKeyWithFlags(ui::VKEY_TAB, ui::EF_CONTROL_DOWN);
-      } else if (event_details.swipe_up()) {
-        DispatchKeyWithFlags(ui::VKEY_NEXT, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_down()) {
-        DispatchKeyWithFlags(ui::VKEY_PRIOR, ui::EF_NONE);
-        return;
-      }
-      return;
-    case 4:
-      // Brightness can be important for low vision users, but none of these
-      // mappings are permanent. Four finger gestures should probably
-      // eventually be used for rare needs that are hard to access through
-      // menus.
-      if (event_details.swipe_left()) {
-        DispatchKeyWithFlags(VKEY_BRIGHTNESS_DOWN, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_right()) {
-        DispatchKeyWithFlags(VKEY_BRIGHTNESS_UP, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_up()) {
-        DispatchKeyWithFlags(VKEY_BROWSER_HOME, ui::EF_NONE);
-        return;
-      } else if (event_details.swipe_down()) {
-        DispatchKeyWithFlags(VKEY_BROWSER_REFRESH, ui::EF_NONE);
-        return;
-      }
-  }
-  return;
+
+  if (event_details.swipe_left())

[aboxhall, 2014/08/05 23:43:41]

This looks so good now!

[evy, 2014/08/05 23:51:18]

Acknowledged.

+    left_swipe_gestures_[num_fingers].Run();
+  else if (event_details.swipe_right())
+    right_swipe_gestures_[num_fingers].Run();
+  else if (event_details.swipe_up())
+    up_swipe_gestures_[num_fingers].Run();
+  else if (event_details.swipe_down())
+    down_swipe_gestures_[num_fingers].Run();
 }
 
 int TouchExplorationController::FindEdgesWithinBounds(gfx::Point point,
                                                       float bounds) {
   // Since GetBoundsInScreen is in DIPs but point is not, then point needs to be
   // converted.
   root_window_->GetHost()->ConvertPointFromNativeScreen(&point);
   gfx::Rect window = root_window_->GetBoundsInScreen();
 
   float left_edge_limit = window.x() + bounds;
@@ skipping 166 matching lines @@
     case ONE_FINGER_PASSTHROUGH:
       return "ONE_FINGER_PASSTHROUGH";
     case WAIT_FOR_NO_FINGERS:
       return "WAIT_FOR_NO_FINGERS";
     case SLIDE_GESTURE:
       return "SLIDE_GESTURE";
   }
   return "Not a state";
 }
 
+void TouchExplorationController::InitializeSwipeClosures() {
+  // Gestures with one finger are used for navigation.
+  left_swipe_gestures_[1] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_LEFT);
+  right_swipe_gestures_[1] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_RIGHT);
+  up_swipe_gestures_[1] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_UP);
+  down_swipe_gestures_[1] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_DOWN);
+
+  // Gestures with two fingers.
+  left_swipe_gestures_[2] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_BROWSER_BACK,
+                 ui::EF_NONE);
+  right_swipe_gestures_[2] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_BROWSER_FORWARD,
+                 ui::EF_NONE);
+  // Jump to top.
+  up_swipe_gestures_[2] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_A);
+  // Read from here.
+  down_swipe_gestures_[2] =
+      base::Bind(&TouchExplorationController::DispatchShiftSearchKeyEvent,
+                 base::Unretained(this),
+                 ui::VKEY_R);
+
+  // Gestures with three fingers switch tabs left/right and scroll up/down.
+  left_swipe_gestures_[3] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_TAB,
+                 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
+  right_swipe_gestures_[3] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_TAB,
+                 ui::EF_CONTROL_DOWN);
+  up_swipe_gestures_[3] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_NEXT,
+                 ui::EF_NONE);
+  down_swipe_gestures_[3] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_PRIOR,
+                 ui::EF_NONE);
+
+  // Gestures with four fingers should probably eventually be used for rare
+  // needs that are hard to access through menus.
+  // Note that brightness levels are here because they can be important for low
+  // vision users. However, but none of these mappings are permanent.

[aboxhall, 2014/08/05 23:43:41]

nit: slightly awkward phrasing (however, but)

[evy, 2014/08/05 23:51:18]

Done.

+  left_swipe_gestures_[4] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 ui::VKEY_BRIGHTNESS_DOWN,
+                 ui::EF_NONE);
+  right_swipe_gestures_[4] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 VKEY_BRIGHTNESS_UP,
+                 ui::EF_NONE);
+  up_swipe_gestures_[4] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 VKEY_BROWSER_HOME,
+                 ui::EF_NONE);
+  down_swipe_gestures_[4] =
+      base::Bind(&TouchExplorationController::DispatchKeyWithFlags,
+                 base::Unretained(this),
+                 VKEY_BROWSER_REFRESH,
+                 ui::EF_NONE);
+
+}
+
 }  // namespace ui