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

Unified Diff: ui/message_center/message_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 | « ui/message_center/message_view.h ('k') | ui/views/color_chooser/color_chooser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/message_view.cc
diff --git a/ui/message_center/message_view.cc b/ui/message_center/message_view.cc
index 7eba1736a8e67a67bb66ef1cffa5dafbc52e6dcb..2fbc8341d26539a1ad36c72547278347f085eb22 100644
--- a/ui/message_center/message_view.cc
+++ b/ui/message_center/message_view.cc
@@ -134,28 +134,29 @@ bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
return true;
}
-ui::EventResult MessageView::OnGestureEvent(ui::GestureEvent* event) {
+void MessageView::OnGestureEvent(ui::GestureEvent* event) {
if (event->type() == ui::ET_GESTURE_TAP) {
list_delegate_->OnNotificationClicked(notification_.id);
- return ui::ER_CONSUMED;
+ event->SetHandled();
+ return;
}
if (event->type() == ui::ET_GESTURE_LONG_PRESS) {
ShowMenu(event->location());
- return ui::ER_CONSUMED;
+ event->SetHandled();
+ return;
}
- ui::EventResult result = SlideOutView::OnGestureEvent(event);
- if (result & ui::ER_CONSUMED)
- return result;
+ SlideOutView::OnGestureEvent(event);
+ if (event->handled())
+ return;
if (!event->IsScrollGestureEvent())
- return result;
+ return;
if (scroller_)
scroller_->OnGestureEvent(event);
-
- return ui::ER_CONSUMED;
+ event->SetHandled();
}
void MessageView::ButtonPressed(views::Button* sender,
« no previous file with comments | « ui/message_center/message_view.h ('k') | ui/views/color_chooser/color_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698