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..c11a43a968a9c81867d0cfa3578a10d580893574 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 InTESecondPress( |
dmazzoni
2014/06/13 05:52:38
TE is too abbreviated for me. How about InTouchExp
evy
2014/06/13 16:48:07
Done.
Should the state name be changed from TE_SEC
|
+ 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 |
dmazzoni
2014/06/13 05:52:38
Nit: end this sentence with a period.
evy
2014/06/13 16:48:08
Done.
|
+ // If the user releases the second finger, a click will go through |
dmazzoni
2014/06/13 05:52:38
To be entirely accurate, we don't send a click, we
evy
2014/06/13 16:48:08
Done.
|
+ // 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. |
+ TE_SECOND_PRESS, |
}; |
void VLOGState(int line_number); |