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

Unified Diff: ui/views/controls/menu/submenu_view.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 | « ui/views/controls/menu/submenu_view.h ('k') | ui/views/controls/scroll_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/submenu_view.cc
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc
index a44fc7b07c2e85d54a460ded3f97f58a91d338af..cf8a27eb70e90b61c03e845b5c636a4207fc17fb 100644
--- a/ui/views/controls/menu/submenu_view.cc
+++ b/ui/views/controls/menu/submenu_view.cc
@@ -260,8 +260,8 @@ bool SubmenuView::OnMouseWheel(const ui::MouseWheelEvent& e) {
return true;
}
-ui::GestureStatus SubmenuView::OnGestureEvent(const ui::GestureEvent& e) {
- ui::GestureStatus to_return = ui::GESTURE_STATUS_CONSUMED;
+ui::EventResult SubmenuView::OnGestureEvent(const ui::GestureEvent& e) {
+ ui::EventResult to_return = ui::ER_CONSUMED;
switch (e.type()) {
case ui::ET_GESTURE_SCROLL_BEGIN:
scroll_animator_->Stop();
@@ -280,7 +280,7 @@ ui::GestureStatus SubmenuView::OnGestureEvent(const ui::GestureEvent& e) {
scroll_animator_->Stop();
break;
default:
- to_return = ui::GESTURE_STATUS_UNKNOWN;
+ to_return = ui::ER_UNHANDLED;
break;
}
return to_return;
« no previous file with comments | « ui/views/controls/menu/submenu_view.h ('k') | ui/views/controls/scroll_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698