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

Unified Diff: ui/views/controls/button/menu_button.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/views/controls/button/menu_button.h ('k') | ui/views/controls/combobox/native_combobox_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/menu_button.cc
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index 601726a5445450bebfb299952f2aa06e64290f0e..b770a6496886bab87e286677423be14033538bce 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -219,13 +219,13 @@ void MenuButton::OnMouseExited(const ui::MouseEvent& event) {
}
}
-ui::EventResult MenuButton::OnGestureEvent(ui::GestureEvent* event) {
+void MenuButton::OnGestureEvent(ui::GestureEvent* event) {
if (state() != STATE_DISABLED && event->type() == ui::ET_GESTURE_TAP) {
if (Activate())
- return ui::ER_CONSUMED;
- return ui::ER_UNHANDLED;
+ event->StopPropagation();
+ return;
}
- return TextButton::OnGestureEvent(event);
+ TextButton::OnGestureEvent(event);
}
bool MenuButton::OnKeyPressed(const ui::KeyEvent& event) {
« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | ui/views/controls/combobox/native_combobox_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698