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

Unified Diff: ash/wm/window_modality_controller_unittest.cc

Issue 10964051: events: Clean up dispatching code for touch-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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
Index: ash/wm/window_modality_controller_unittest.cc
diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc
index d749bd6e4bbb6bc4ce402fe73c597cf59685cf56..f6f4271d24542bc40d34544fdc11c956ae2021bd 100644
--- a/ash/wm/window_modality_controller_unittest.cc
+++ b/ash/wm/window_modality_controller_unittest.cc
@@ -294,7 +294,7 @@ class TouchTrackerWindowDelegate : public aura::test::TestWindowDelegate {
private:
// Overridden from aura::test::TestWindowDelegate.
- virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+ virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
received_touch_ = true;
return aura::test::TestWindowDelegate::OnTouchEvent(event);
}
« no previous file with comments | « ash/wm/toplevel_window_event_handler.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698