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

Unified Diff: ui/aura/event_filter.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
« no previous file with comments | « ui/aura/event_filter.h ('k') | ui/aura/event_filter_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 d7f4719b468595fe4efca8f027da50c226829383..d8c4f287096a2cf50358b6c34e6047093064cb63 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -41,8 +41,10 @@ ui::EventResult EventFilter::OnScrollEvent(ui::ScrollEvent* event) {
return ui::ER_UNHANDLED;
}
-ui::TouchStatus EventFilter::OnTouchEvent(ui::TouchEvent* event) {
- return PreHandleTouchEvent(static_cast<Window*>(event->target()), event);
+ui::EventResult EventFilter::OnTouchEvent(ui::TouchEvent* event) {
+ ui::TouchStatus status = PreHandleTouchEvent(
+ static_cast<Window*>(event->target()), event);
+ return ui::EventResultFromTouchStatus(status);
}
ui::EventResult EventFilter::OnGestureEvent(ui::GestureEvent* event) {
« no previous file with comments | « ui/aura/event_filter.h ('k') | ui/aura/event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698