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

Unified Diff: ui/aura/event_filter.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (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 1a6fbacd91a47e324e63ff23a9536d20b577e42f..9f2c35745a3d56d7d6a8c85d2d8a78bf08b654a8 100644
--- a/ui/aura/event_filter.cc
+++ b/ui/aura/event_filter.cc
@@ -21,9 +21,9 @@ ui::TouchStatus EventFilter::PreHandleTouchEvent(Window* target,
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus EventFilter::PreHandleGestureEvent(Window* target,
- ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ui::EventResult EventFilter::PreHandleGestureEvent(Window* target,
+ ui::GestureEvent* event) {
+ return ui::ER_UNHANDLED;
}
ui::EventResult EventFilter::OnKeyEvent(ui::EventTarget* target,
@@ -50,8 +50,7 @@ ui::TouchStatus EventFilter::OnTouchEvent(ui::EventTarget* target,
ui::EventResult EventFilter::OnGestureEvent(ui::EventTarget* target,
ui::GestureEvent* event) {
- return PreHandleGestureEvent(static_cast<Window*>(target), event) ==
- ui::GESTURE_STATUS_CONSUMED ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
+ return PreHandleGestureEvent(static_cast<Window*>(target), event);
}
} // namespace aura
« 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