| Index: ui/chromeos/touch_exploration_controller.cc
|
| diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
|
| index aebf053350238d9575eb0604a35331a5e8ae26fb..2aab8ddafdccd1637fe2182e6f2b9e9c13137f39 100644
|
| --- a/ui/chromeos/touch_exploration_controller.cc
|
| +++ b/ui/chromeos/touch_exploration_controller.cc
|
| @@ -44,7 +44,6 @@ TouchExplorationController::TouchExplorationController(
|
| root_window->GetHost()->GetEventSource()->AddEventRewriter(this);
|
| }
|
|
|
| -
|
| TouchExplorationController::~TouchExplorationController() {
|
| root_window_->GetHost()->GetEventSource()->RemoveEventRewriter(this);
|
| }
|
| @@ -174,7 +173,6 @@ ui::EventRewriteStatus TouchExplorationController::InNoFingersDown(
|
| ui::EventRewriteStatus TouchExplorationController::InSingleTapPressed(
|
| const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event) {
|
| const ui::EventType type = event.type();
|
| -
|
| if (type == ui::ET_TOUCH_PRESSED) {
|
| // Adding a second finger within the timeout period switches to
|
| // passthrough.
|
| @@ -383,6 +381,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchExploreSecondPress(
|
| event.time_stamp()));
|
| (*rewritten_event)->set_flags(event.flags());
|
| state_ = TOUCH_EXPLORATION;
|
| + EnterTouchToMouseMode();
|
| VLOG_STATE();
|
| return ui::EVENT_REWRITE_REWRITTEN;
|
| }
|
|
|