| 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;
|
|
|