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

Side by Side Diff: ui/views/controls/menu/menu_host_root_view.cc

Issue 10843060: views: Fix gesture event propagation in menus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/wrench_menu.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/menu/menu_host_root_view.h" 5 #include "ui/views/controls/menu/menu_host_root_view.h"
6 6
7 #include "ui/views/controls/menu/menu_controller.h" 7 #include "ui/views/controls/menu/menu_controller.h"
8 #include "ui/views/controls/menu/submenu_view.h" 8 #include "ui/views/controls/menu/submenu_view.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #else 56 #else
57 // Windows uses focus_util_win::RerouteMouseWheel to forward events to 57 // Windows uses focus_util_win::RerouteMouseWheel to forward events to
58 // the right menu. 58 // the right menu.
59 // RootView::OnMouseWheel forwards to the focused view. We don't have a 59 // RootView::OnMouseWheel forwards to the focused view. We don't have a
60 // focused view, so we need to override this then forward to the menu. 60 // focused view, so we need to override this then forward to the menu.
61 return submenu_->OnMouseWheel(event); 61 return submenu_->OnMouseWheel(event);
62 #endif 62 #endif
63 } 63 }
64 64
65 ui::GestureStatus MenuHostRootView::OnGestureEvent(const GestureEvent& event) { 65 ui::GestureStatus MenuHostRootView::OnGestureEvent(const GestureEvent& event) {
66 RootView::OnGestureEvent(event);
66 // ChromeOS uses MenuController to forward events like other 67 // ChromeOS uses MenuController to forward events like other
67 // mouse events. 68 // mouse events.
68 if (!GetMenuController()) 69 if (!GetMenuController())
69 return ui::GESTURE_STATUS_UNKNOWN; 70 return ui::GESTURE_STATUS_UNKNOWN;
70 return GetMenuController()->OnGestureEvent(submenu_, event); 71 return GetMenuController()->OnGestureEvent(submenu_, event);
71 } 72 }
72 73
73 MenuController* MenuHostRootView::GetMenuController() { 74 MenuController* MenuHostRootView::GetMenuController() {
74 return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL; 75 return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL;
75 } 76 }
76 77
77 } // namespace views 78 } // namespace views
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/wrench_menu.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698