Make touch accessibility gestures work with ChromeVox Next

ui/chromeos/touch_exploration_controller.h

 // 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.
 
 #ifndef UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
 #define UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "base/time/tick_clock.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/chromeos/ui_chromeos_export.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
 #include "ui/events/gesture_detection/gesture_detector.h"
 #include "ui/events/gestures/gesture_provider_aura.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 class Window;
 }
@@ skipping 27 matching lines @@
   // played.
   virtual void PlayPassthroughEarcon() = 0;
 
   // This function should be called when the exit screen earcon should be
   // played.
   virtual void PlayExitScreenEarcon() = 0;
 
   // This function should be called when the enter screen earcon should be
   // played.
   virtual void PlayEnterScreenEarcon() = 0;
+
+  // Called when the user performed an accessibility gesture while in
+  // touch accessibility mode, that should be forwarded to ChromeVox.

[David Tseng, 2016/05/05 22:30:39]

nit: room for touch

[dmazzoni, 2016/05/06 19:06:09]

Done.

+  virtual void HandleAccessibilityGesture(ui::AXGesture gesture) = 0;
 };
 
 // TouchExplorationController is used in tandem with "Spoken Feedback" to
 // make the touch UI accessible. Gestures performed in the middle of the screen
 // are mapped to accessibility key shortcuts while gestures performed on the
 // edge of the screen can change settings.
 //
 // ** Short version **
 //
 // At a high-level, single-finger events are used for accessibility -
@@ skipping 185 matching lines @@
   void OnGestureEvent(ui::GestureConsumer* raw_input_consumer,
                       ui::GestureEvent* gesture) override;
 
   // Process the gesture events that have been created.
   void ProcessGestureEvents();
 
   void OnSwipeEvent(ui::GestureEvent* swipe_gesture);
 
   void SideSlideControl(ui::GestureEvent* gesture);
 
-  // Dispatches the keyboard short cut Shift+Search+<arrow key>
-  // outside the event rewritting flow.
-  void DispatchShiftSearchKeyEvent(const ui::KeyboardCode third_key);
-
-  // Binds DispatchShiftSearchKeyEvent to a specific third key.
-  base::Closure BindShiftSearchKeyEvent(const ui::KeyboardCode third_key);
-
   // Dispatches a single key with the given flags.
   void DispatchKeyWithFlags(const ui::KeyboardCode key, int flags);
 
   // Binds DispatchKeyWithFlags to a specific key and flags.
   base::Closure BindKeyEventWithFlags(const ui::KeyboardCode key, int flags);
 
   std::unique_ptr<ui::MouseEvent> CreateMouseMoveEvent(
       const gfx::PointF& location,
       int flags);
 
@@ skipping 126 matching lines @@
   // (e.g. resetting the gesture provider).
   void SetState(State new_state, const char* function_name);
 
   void VlogState(const char* function_name);
 
   void VlogEvent(const ui::TouchEvent& event, const char* function_name);
 
   // Gets enum name from integer value.
   const char* EnumStateToString(State state);
 
-  // Maps each single/multi finger swipe to the function that dispatches
-  // the corresponding key events.
-  void InitializeSwipeGestureMaps();
-
   aura::Window* root_window_;
 
   // Handles volume control. Not owned.
   ui::TouchExplorationControllerDelegate* delegate_;
 
   // A set of touch ids for fingers currently touching the screen.
   std::vector<int> current_touch_ids_;
 
   // Map of touch ids to their last known location.
   std::map<int, gfx::PointF> touch_locations_;
@@ skipping 43 matching lines @@
   // A copy of the previous event passed.
   std::unique_ptr<ui::TouchEvent> prev_event_;
 
   // This toggles whether VLOGS are turned on or not.
   bool VLOG_on_;
 
   // When touch_exploration_controller gets time relative to real time during
   // testing, this clock is set to the simulated clock and used.
   base::TickClock* tick_clock_;
 
-  // Maps the number of fingers in a swipe to the resulting functions that
-  // dispatch key events.
-  std::map<int, base::Closure> left_swipe_gestures_;
-  std::map<int, base::Closure> right_swipe_gestures_;
-  std::map<int, base::Closure> up_swipe_gestures_;
-  std::map<int, base::Closure> down_swipe_gestures_;
-
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationController);
 };
 
 }  // namespace ui
 
 #endif  // UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_