Added split tap to TouchExplorationController

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 ab07f2c26c707a346bebbb373405adb86dc49db8..aa7060653ff91dafd8ff8ffe0cf449bc6e293c54 100644
--- a/ui/chromeos/touch_exploration_controller.h
+++ b/ui/chromeos/touch_exploration_controller.h
@@ -59,6 +59,9 @@ class TouchEvent;
 // of the last successful touch exploration - that allows the user to explore
 // anywhere on the screen, hear its description, then double-tap anywhere
 // to activate it.
+//// If the user enters touch exploration mode, they can click without lifting

[dmazzoni, 2014/06/17 15:50:40]

nit: I think there's a newline missing?

[evy, 2014/06/17 15:57:33]

Done.

+// their touch exploration finger by tapping anywhere else on the screen with
+// a second finger, while the touch exploration finger is still pressed.
 //
 // If the user adds a second finger during the grace period, they enter
 // passthrough mode. In this mode, the first finger is ignored but all
@@ -105,7 +108,8 @@ class UI_CHROMEOS_EXPORT TouchExplorationController :
       const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
   ui::EventRewriteStatus InPassthroughMinusOne(
       const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
-
+  ui::EventRewriteStatus InTouchExplSecondPress(
+      const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
   // This timer is started every time we get the first press event, and
   // it fires after the double-click timeout elapses (300 ms by default).
   // If the user taps and releases within 300 ms and doesn't press again,
@@ -159,6 +163,13 @@ class UI_CHROMEOS_EXPORT TouchExplorationController :
     // the user starts a scroll with 2 fingers, they can release either one
     // and continue the scrolling.
     PASSTHROUGH_MINUS_ONE,
+
+    // 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
+    // releases the touch explore finger, the other finger will continue with
+    // touch explore. Any fingers pressed past the first two are ignored.
+    TOUCH_EXPL_SECOND_PRESS,
   };
 
   void VlogState(const char* function_name);
@@ -192,7 +203,7 @@ class UI_CHROMEOS_EXPORT TouchExplorationController :
 
   // The last location where we synthesized a mouse move event.
   // When the user double-taps, we send the passed-through tap here.
-  gfx::PointF last_touch_exploration_location_;
+  scoped_ptr<ui::TouchEvent> last_touch_exploration_;
 
   // A timer to fire the mouse move event after the double-tap delay.
   base::OneShotTimer<TouchExplorationController> tap_timer_;