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

Unified Diff: ui/aura/root_window_unittest.cc

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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/aura/event_filter.cc ('k') | ui/aura/shared/compound_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index af609adc6eaa234b16df3a3f25af1e1b47a5b059..e8a5524c47b1dab4982c79d6dd0c9664a1ea69b7 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -103,10 +103,10 @@ class EventCountFilter : public EventFilter {
num_mouse_events_++;
return true;
}
- virtual ui::TouchStatus PreHandleTouchEvent(
+ virtual ui::EventResult PreHandleTouchEvent(
Window* target, ui::TouchEvent* event) OVERRIDE {
num_touch_events_++;
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual ui::EventResult PreHandleGestureEvent(
Window* target, ui::GestureEvent* event) OVERRIDE {
@@ -459,11 +459,11 @@ class EventFilterRecorder : public EventFilter {
events_.push_back(event->type());
return true;
}
- virtual ui::TouchStatus PreHandleTouchEvent(
+ virtual ui::EventResult PreHandleTouchEvent(
Window* target,
ui::TouchEvent* event) OVERRIDE {
events_.push_back(event->type());
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual ui::EventResult PreHandleGestureEvent(
Window* target,
« no previous file with comments | « ui/aura/event_filter.cc ('k') | ui/aura/shared/compound_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698