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

Unified Diff: ash/system/tray/tray_notification_view.cc

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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_notification_view.h ('k') | ash/system/tray/tray_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_notification_view.cc
diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc
index 2c4929b507a3d7ae1d4677f4152746611368845d..1565fd7a168da645e2faa11a05d3ea9de9de6780 100644
--- a/ash/system/tray/tray_notification_view.cc
+++ b/ash/system/tray/tray_notification_view.cc
@@ -124,13 +124,14 @@ bool TrayNotificationView::OnMousePressed(const ui::MouseEvent& event) {
return true;
}
-ui::EventResult TrayNotificationView::OnGestureEvent(ui::GestureEvent* event) {
- if (SlideOutView::OnGestureEvent(event) == ui::ER_CONSUMED)
- return ui::ER_CONSUMED;
+void TrayNotificationView::OnGestureEvent(ui::GestureEvent* event) {
+ SlideOutView::OnGestureEvent(event);
+ if (event->handled())
+ return;
if (event->type() != ui::ET_GESTURE_TAP)
- return ui::ER_UNHANDLED;
+ return;
HandleClickAction();
- return ui::ER_CONSUMED;
+ event->SetHandled();
}
void TrayNotificationView::OnClose() {
« no previous file with comments | « ash/system/tray/tray_notification_view.h ('k') | ash/system/tray/tray_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698