| 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 71da3263c79cb0462b3ec116268e1c7d8fa030eb..0ace2d15192f5bc9676225815c49f1b1b850f143 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::EventResult SubmenuView::OnGestureEvent(ui::GestureEvent* event) {
|
| - ui::EventResult to_return = ui::ER_CONSUMED;
|
| +void SubmenuView::OnGestureEvent(ui::GestureEvent* event) {
|
| + bool handled = true;
|
| switch (event->type()) {
|
| case ui::ET_GESTURE_SCROLL_BEGIN:
|
| scroll_animator_->Stop();
|
| @@ -280,10 +280,11 @@ ui::EventResult SubmenuView::OnGestureEvent(ui::GestureEvent* event) {
|
| scroll_animator_->Stop();
|
| break;
|
| default:
|
| - to_return = ui::ER_UNHANDLED;
|
| + handled = false;
|
| break;
|
| }
|
| - return to_return;
|
| + if (handled)
|
| + event->SetHandled();
|
| }
|
|
|
| bool SubmenuView::IsShowing() {
|
|
|