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 5fe2e09b238a9bcbe6f7be6f40df67920e8fac83..6224f0118cbc95e45a9087f88d86436bc9137d50 100644
--- a/ui/chromeos/touch_exploration_controller.h
+++ b/ui/chromeos/touch_exploration_controller.h
@@ -105,7 +105,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 +160,14 @@ 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. Once more than two fingers are pressed, the state
+    // is changed to wait for all fingers to be released before continuing.

[aboxhall, 2014/06/13 17:06:48]

"...wait for all fingers to be released" etc: does this mean that if you're
aiming for a split tap but brush a third finger against the screen, the split
tap will fail to register and you'll have to take all fingers off before
retrying?

[evy, 2014/06/13 17:48:59]

Oh sorry, this was an old comment from how I used to think it was going to work.
Currently, extra fingers should be ignored. (there's some kind of bug there
though)

+    TE_SECOND_PRESS,
   };
 
   void VLOGState(int line_number);
@@ -192,7 +201,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_;