Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Unified Diff: ui/chromeos/touch_exploration_controller_unittest.cc

Issue 428643008: Revert of Fix Touch Exploration tests so they don't break eager gesture detection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « ui/chromeos/touch_exploration_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/touch_exploration_controller_unittest.cc
diff --git a/ui/chromeos/touch_exploration_controller_unittest.cc b/ui/chromeos/touch_exploration_controller_unittest.cc
index ffe4d090b8b3ce8779e8785a3c7ba77a58577ead..f305e2b43a19ee728994de1541b00a5da0270fb5 100644
--- a/ui/chromeos/touch_exploration_controller_unittest.cc
+++ b/ui/chromeos/touch_exploration_controller_unittest.cc
@@ -112,6 +112,12 @@ class TouchExplorationControllerTestApi {
}
}
+ void SetEventHandlerForTesting(
+ ui::EventHandler* event_handler_for_testing) {
+ touch_exploration_controller_->event_handler_for_testing_ =
+ event_handler_for_testing;
+ }
+
bool IsInNoFingersDownStateForTesting() const {
return touch_exploration_controller_->state_ ==
touch_exploration_controller_->NO_FINGERS_DOWN;
@@ -254,6 +260,8 @@ class TouchExplorationTest : public aura::test::AuraTestBase {
touch_exploration_controller_.reset(
new ui::TouchExplorationControllerTestApi(
new TouchExplorationController(root_window(), &delegate_)));
+ touch_exploration_controller_->SetEventHandlerForTesting(
+ &event_capturer_);
cursor_client()->ShowCursor();
cursor_client()->DisableMouseEvents();
}
« no previous file with comments | « ui/chromeos/touch_exploration_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698