ui/chromeos/touch_exploration_controller.cc - Issue 428673002: Fix Touch Exploration tests so they don't break eager gesture detection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/chromeos/touch_exploration_controller.cc

Issue 428673002: Fix Touch Exploration tests so they don't break eager gesture detection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc ('K') | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/touch_exploration_controller_unittest.cc » ('j') | ui/chromeos/touch_exploration_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..c44b9a7203a592d24380a3e88ebe5751338914b9 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) {

@@ -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);

}