Added multi-finger gestures to touch_exploration_controller

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/time/tick_clock.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
@@ skipping 194 matching lines @@
   // 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);
 
   void SideSlideControl(ui::GestureEvent* gesture);
 
-  // Dispatches the keyboard short cut Shift+Search+<arrow key>
+  // Dispatches the keyboard short cut Shift+Search+<key>
   // outside the event rewritting flow.
-  void DispatchShiftSearchKeyEvent(const ui::KeyboardCode direction);
+  void DispatchShiftSearchKeyEvent(const ui::KeyboardCode third_key);
+
+  // Dispatches a single key with no flags.
+  void DispatchKeyWithNoFlags(const ui::KeyboardCode key);
 
   scoped_ptr<ui::Event> CreateMouseMoveEvent(const gfx::PointF& location,
                                              int flags);
 
   void EnterTouchToMouseMode();
 
   // Set the state to NO_FINGERS_DOWN and reset any other fields to their
   // default value.
   void ResetToNoFingersDown();
 
@@ skipping 159 matching lines @@
 
   // The previous state entered.
   State prev_state_;
 
   // A copy of the previous event passed.
   scoped_ptr<ui::TouchEvent> prev_event_;
 
   // This toggles whether VLOGS are turned on or not.
   bool VLOG_on_;
 
+  // This will ensure touch events continue to be sent to the gesture
+  // provider after a gesture ends, so that pointer ids are updated.
+  // It's initialized to false and set to false in ResetToNoFingersDown.

[aboxhall, 2014/07/30 00:25:16]

Where is it set to true?

[evy, 2014/08/04 23:06:30]

(this variable was removed, the code flow should be a bit smoother)

+  bool send_gesture_events_;
+
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationController);
 };
 
 }  // namespace ui
 
 #endif  // UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_