Index: ui/chromeos/touch_exploration_controller.cc |
diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc |
index 166db54875ac56cf5bf33a2ca10e5ef311cb0b9c..01e3d5424eb46c0d82cf0307999af99242e7b598 100644 |
--- a/ui/chromeos/touch_exploration_controller.cc |
+++ b/ui/chromeos/touch_exploration_controller.cc |
@@ -33,7 +33,6 @@ TouchExplorationController::TouchExplorationController( |
: root_window_(root_window), |
delegate_(delegate), |
state_(NO_FINGERS_DOWN), |
- event_handler_for_testing_(NULL), |
gesture_provider_(this), |
prev_state_(NO_FINGERS_DOWN), |
VLOG_on_(true) { |
@@ -595,13 +594,13 @@ void TouchExplorationController::OnTapTimerFired() { |
case GESTURE_IN_PROGRESS: |
// Discard any pending gestures. |
delete gesture_provider_.GetAndResetPendingGestures(); |
- EnterTouchToMouseMode(); |
state_ = TOUCH_EXPLORATION; |
VLOG_STATE(); |
break; |
default: |
return; |
} |
+ EnterTouchToMouseMode(); |
scoped_ptr<ui::Event> mouse_move = |
CreateMouseMoveEvent(initial_press_->location(), initial_press_->flags()); |
DispatchEvent(mouse_move.get()); |
@@ -609,10 +608,6 @@ void TouchExplorationController::OnTapTimerFired() { |
} |
void TouchExplorationController::DispatchEvent(ui::Event* event) { |
- if (event_handler_for_testing_) { |
- event_handler_for_testing_->OnEvent(event); |
- return; |
- } |
ui::EventDispatchDetails result ALLOW_UNUSED = |
root_window_->GetHost()->dispatcher()->OnEventFromSource(event); |
} |