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

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

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « ui/views/controls/menu/menu_host_root_view.h ('k') | ui/views/controls/resize_area.h » ('j') | 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 {
11 11
12 MenuHostRootView::MenuHostRootView(Widget* widget, 12 MenuHostRootView::MenuHostRootView(Widget* widget,
13 SubmenuView* submenu) 13 SubmenuView* submenu)
14 : internal::RootView(widget), 14 : internal::RootView(widget),
15 submenu_(submenu), 15 submenu_(submenu),
16 forward_drag_to_menu_controller_(true) { 16 forward_drag_to_menu_controller_(true) {
17 } 17 }
18 18
19 bool MenuHostRootView::OnMousePressed(const MouseEvent& event) { 19 bool MenuHostRootView::OnMousePressed(const ui::MouseEvent& event) {
20 forward_drag_to_menu_controller_ = 20 forward_drag_to_menu_controller_ =
21 !GetLocalBounds().Contains(event.location()) || 21 !GetLocalBounds().Contains(event.location()) ||
22 !RootView::OnMousePressed(event); 22 !RootView::OnMousePressed(event);
23 if (forward_drag_to_menu_controller_ && GetMenuController()) 23 if (forward_drag_to_menu_controller_ && GetMenuController())
24 GetMenuController()->OnMousePressed(submenu_, event); 24 GetMenuController()->OnMousePressed(submenu_, event);
25 return true; 25 return true;
26 } 26 }
27 27
28 bool MenuHostRootView::OnMouseDragged(const MouseEvent& event) { 28 bool MenuHostRootView::OnMouseDragged(const ui::MouseEvent& event) {
29 if (forward_drag_to_menu_controller_ && GetMenuController()) { 29 if (forward_drag_to_menu_controller_ && GetMenuController()) {
30 GetMenuController()->OnMouseDragged(submenu_, event); 30 GetMenuController()->OnMouseDragged(submenu_, event);
31 return true; 31 return true;
32 } 32 }
33 return RootView::OnMouseDragged(event); 33 return RootView::OnMouseDragged(event);
34 } 34 }
35 35
36 void MenuHostRootView::OnMouseReleased(const MouseEvent& event) { 36 void MenuHostRootView::OnMouseReleased(const ui::MouseEvent& event) {
37 RootView::OnMouseReleased(event); 37 RootView::OnMouseReleased(event);
38 if (forward_drag_to_menu_controller_ && GetMenuController()) { 38 if (forward_drag_to_menu_controller_ && GetMenuController()) {
39 forward_drag_to_menu_controller_ = false; 39 forward_drag_to_menu_controller_ = false;
40 GetMenuController()->OnMouseReleased(submenu_, event); 40 GetMenuController()->OnMouseReleased(submenu_, event);
41 } 41 }
42 } 42 }
43 43
44 void MenuHostRootView::OnMouseMoved(const MouseEvent& event) { 44 void MenuHostRootView::OnMouseMoved(const ui::MouseEvent& event) {
45 RootView::OnMouseMoved(event); 45 RootView::OnMouseMoved(event);
46 if (GetMenuController()) 46 if (GetMenuController())
47 GetMenuController()->OnMouseMoved(submenu_, event); 47 GetMenuController()->OnMouseMoved(submenu_, event);
48 } 48 }
49 49
50 bool MenuHostRootView::OnMouseWheel(const MouseWheelEvent& event) { 50 bool MenuHostRootView::OnMouseWheel(const MouseWheelEvent& event) {
51 #if defined(OS_LINUX) 51 #if defined(OS_LINUX)
52 // ChromeOS uses MenuController to forward events like other 52 // ChromeOS uses MenuController to forward events like other
53 // mouse events. 53 // mouse events.
54 return GetMenuController() && 54 return GetMenuController() &&
(...skipping 14 matching lines...) Expand all
69 if (!GetMenuController()) 69 if (!GetMenuController())
70 return ui::GESTURE_STATUS_UNKNOWN; 70 return ui::GESTURE_STATUS_UNKNOWN;
71 return GetMenuController()->OnGestureEvent(submenu_, event); 71 return GetMenuController()->OnGestureEvent(submenu_, event);
72 } 72 }
73 73
74 MenuController* MenuHostRootView::GetMenuController() { 74 MenuController* MenuHostRootView::GetMenuController() {
75 return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL; 75 return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL;
76 } 76 }
77 77
78 } // namespace views 78 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_host_root_view.h ('k') | ui/views/controls/resize_area.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698