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

Unified Diff: ui/aura/event_filter.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.h ('k') | ui/aura/root_window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/event_filter.cc
diff --git a/ui/aura/event_filter.cc b/ui/aura/event_filter.cc
index d8c4f287096a2cf50358b6c34e6047093064cb63..06201b11f1289f65693a636d175e9c69f5cee8f0 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -17,9 +17,9 @@ bool EventFilter::PreHandleMouseEvent(Window* target, ui::MouseEvent* event) {
return false;
}
-ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target,
+ui::EventResult EventFilter::PreHandleTouchEvent(Window* target,
ui::TouchEvent* event) {
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
@@ -42,9 +42,7 @@ ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
}
ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) {
- ui::TouchStatus status = PreHandleTouchEvent(
- static_cast<Window*>(event->target()), event);
- return ui::EventResultFromTouchStatus(status);
+ return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
}
ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
« no previous file with comments | « ui/aura/event_filter.h ('k') | ui/aura/root_window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698