Revert of Swipe Gestures for Accessibility

ui/chromeos/touch_exploration_controller.h

Index: ui/chromeos/touch_exploration_controller.h
diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h
index 6ade40a0c1ab856f420b337f69d080c9090a91a3..100a47a68d138a94aa1e46b851cf0f8e4057516d 100644
--- a/ui/chromeos/touch_exploration_controller.h
+++ b/ui/chromeos/touch_exploration_controller.h
@@ -11,7 +11,6 @@
 #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 {
@@ -22,13 +21,10 @@
 
 class Event;
 class EventHandler;
-class GestureEvent;
-class GestureProviderAura;
 class TouchEvent;
 
 // TouchExplorationController is used in tandem with "Spoken Feedback" to
-// make the touch UI accessible. Gestures are mapped to accessiblity key
-// shortcuts.
+// make the touch UI accessible.
 //
 // ** Short version **
 //
@@ -36,8 +32,7 @@
 // exploring the screen gets turned into mouse moves (which can then be
 // spoken by an accessibility service running), a single tap while the user
 // is in touch exploration or a double-tap simulates a click, and gestures
-// can be used to send high-level accessibility commands. For example, a swipe
-// right would correspond to the keyboard short cut shift+search+right.
+// can be used to send high-level accessibility commands.
 // When two or more fingers are pressed initially, from then on the events
 // are passed through, but with the initial finger removed - so if you swipe
 // down with two fingers, the running app will see a one-finger swipe.
@@ -65,14 +60,6 @@
 // This will result in a click on the last successful touch exploration
 // location. This allows the user to perform a single tap
 // anywhere to activate it.
-//
-// The user can perform swipe gestures in one of the four cardinal directions
-// which will be interpreted and used to control the UI. The gesture will only
-// be registered if the finger moves outside the slop and completed within the
-// grace period. If additional fingers are added during the grace period, the
-// state changes to passthrough. If the gesture fails to be completed within the
-// grace period, the state changes to touch exploration mode. Once the state has
-// changed, any gestures made during the grace period are discarded.
 //
 // If the user double-taps, the second tap is passed through, allowing the
 // user to click - however, the double-tap location is changed to the location
@@ -97,8 +84,7 @@
 // The caller is expected to retain ownership of instances of this class and
 // destroy them before |root_window| is destroyed.
 class UI_CHROMEOS_EXPORT TouchExplorationController
-    : public ui::EventRewriter,
-      public ui::GestureProviderAuraClient {
+    : public ui::EventRewriter {
  public:
   explicit TouchExplorationController(aura::Window* root_window);
   virtual ~TouchExplorationController();
@@ -106,7 +92,6 @@
   void CallTapTimerNowForTesting();
   void SetEventHandlerForTesting(ui::EventHandler* event_handler_for_testing);
   bool IsInNoFingersDownStateForTesting() const;
-  bool IsInGestureInProgressStateForTesting() const;
 
  private:
   // Overridden from ui::EventRewriter
@@ -131,8 +116,6 @@
       const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
   ui::EventRewriteStatus InPassthrough(
       const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
-  ui::EventRewriteStatus InGestureInProgress(
-      const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
   ui::EventRewriteStatus InTouchExploreSecondPress(
       const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
   ui::EventRewriteStatus InWaitForRelease(
@@ -146,23 +129,6 @@
 
   // Dispatch a new event outside of the event rewriting flow.
   void DispatchEvent(ui::Event* event);
-
-  // Overridden from GestureProviderAuraClient.
-  //
-  // The gesture provider keeps track of all the touch events after
-  // the user moves fast enough to trigger a gesture. After the user
-  // completes their gesture, this method will decide what keyboard
-  // input their gesture corresponded to.
-  virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE;
-
-  // Process the gesture events that have been created.
-  void ProcessGestureEvents();
-
-  void OnSwipeEvent(ui::GestureEvent* swipe_gesture);
-
-  // Dispatches the keyboard short cut Shift+Search+<arrow key>
-  // outside the event rewritting flow.
-  void DispatchShiftSearchKeyEvent(const ui::KeyboardCode direction);
 
   scoped_ptr<ui::Event> CreateMouseMoveEvent(const gfx::PointF& location,
                                              int flags);
@@ -206,15 +172,6 @@
     // mode until all fingers are lifted.
     TOUCH_EXPLORATION,
 
-    // If the user moves their finger faster than the threshold velocity after a
-    // single tap, the touch events that follow will be translated into gesture
-    // events. If the user successfully completes a gesture within the grace
-    // period, the gesture will be interpreted and used to control the UI via
-    // discrete actions - currently by synthesizing key events corresponding to
-    // each gesture Otherwise, the collected gestures are discarded and the
-    // state changes to touch_exploration.
-    GESTURE_IN_PROGRESS,
-
     // The user was in touch exploration, but has placed down another finger.
     // If the user releases the second finger, a touch press and release
     // will go through at the last touch explore location. If the user
@@ -287,9 +244,6 @@
   // timeout and pixel slop constants.
   ui::GestureDetector::Config gesture_detector_config_;
 
-  // Gesture Handler to interpret the touch events.
-  ui::GestureProviderAura gesture_provider_;
-
   // The previous state entered.
   State prev_state_;