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

Unified Diff: ash/system/tray/tray_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 | « ash/system/tray/tray_event_filter.h ('k') | ash/tooltips/tooltip_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_event_filter.cc
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
index 5a0355e53b1a042da4950e4d6d6fa75f538dc4bf..c148c97021cad81c3eca7b664c0876d71e5c5c00 100644
--- a/ash/system/tray/tray_event_filter.cc
+++ b/ash/system/tray/tray_event_filter.cc
@@ -41,13 +41,13 @@ bool TrayEventFilter::PreHandleMouseEvent(aura::Window* target,
return false;
}
-ui::TouchStatus TrayEventFilter::PreHandleTouchEvent(aura::Window* target,
+ui::EventResult TrayEventFilter::PreHandleTouchEvent(aura::Window* target,
ui::TouchEvent* event) {
if (event->type() == ui::ET_TOUCH_PRESSED) {
if (ProcessLocatedEvent(target, *event))
- return ui::TOUCH_STATUS_END;
+ return ui::ER_CONSUMED;
}
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
ui::EventResult TrayEventFilter::PreHandleGestureEvent(
« no previous file with comments | « ash/system/tray/tray_event_filter.h ('k') | ash/tooltips/tooltip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698