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

Unified Diff: ash/system/web_notification/web_notification_tray.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 | « ash/system/tray/tray_views.cc ('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/web_notification/web_notification_tray.cc
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index 1e0ecf09aa1138110613c8dc15968119d5f87922..1fc74a12d9747a9bee5c9717f98ce6c03bc0d4bc 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -492,16 +492,16 @@ class WebNotificationView : public views::View,
return true;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
const ui::GestureEvent& event) OVERRIDE {
if (event.type() == ui::ET_GESTURE_TAP) {
tray_->OnClicked(notification_.id);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
ShowMenu(event.location());
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (event.type() == ui::ET_SCROLL_FLING_START) {
@@ -515,11 +515,11 @@ class WebNotificationView : public views::View,
RestoreVisualState();
scroller_->OnGestureEvent(event);
}
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (!event.IsScrollGestureEvent())
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
gesture_scroll_amount_ = 0.f;
@@ -544,7 +544,7 @@ class WebNotificationView : public views::View,
if (scroller_)
scroller_->OnGestureEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
// Overridden from ButtonListener.
« no previous file with comments | « ash/system/tray/tray_views.cc ('k') | ash/tooltips/tooltip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698