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