| Index: ui/views/controls/menu/menu_host_root_view.cc
|
| diff --git a/ui/views/controls/menu/menu_host_root_view.cc b/ui/views/controls/menu/menu_host_root_view.cc
|
| index 44ed97f0ba8e9b842d6042cfa3c96966f3fa89e3..56086ea1cf6789b6b0699e34d4270d60e2d8275a 100644
|
| --- a/ui/views/controls/menu/menu_host_root_view.cc
|
| +++ b/ui/views/controls/menu/menu_host_root_view.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -62,6 +62,14 @@ bool MenuHostRootView::OnMouseWheel(const MouseWheelEvent& event) {
|
| #endif
|
| }
|
|
|
| +ui::GestureStatus MenuHostRootView::OnGestureEvent(const GestureEvent& event) {
|
| + // ChromeOS uses MenuController to forward events like other
|
| + // mouse events.
|
| + if (!GetMenuController())
|
| + return ui::GESTURE_STATUS_UNKNOWN;
|
| + return GetMenuController()->OnGestureEvent(submenu_, event);
|
| +}
|
| +
|
| MenuController* MenuHostRootView::GetMenuController() {
|
| return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL;
|
| }
|
|
|