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

Side by Side Diff: ui/views/controls/menu/menu_controller.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/link.cc ('k') | ui/views/controls/menu/menu_controller.cc » ('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 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <list> 10 #include <list>
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // NOTE: the coordinates of the events are in that of the 111 // NOTE: the coordinates of the events are in that of the
112 // MenuScrollViewContainer. 112 // MenuScrollViewContainer.
113 void OnMousePressed(SubmenuView* source, const ui::MouseEvent& event); 113 void OnMousePressed(SubmenuView* source, const ui::MouseEvent& event);
114 void OnMouseDragged(SubmenuView* source, const ui::MouseEvent& event); 114 void OnMouseDragged(SubmenuView* source, const ui::MouseEvent& event);
115 void OnMouseReleased(SubmenuView* source, const ui::MouseEvent& event); 115 void OnMouseReleased(SubmenuView* source, const ui::MouseEvent& event);
116 void OnMouseMoved(SubmenuView* source, const ui::MouseEvent& event); 116 void OnMouseMoved(SubmenuView* source, const ui::MouseEvent& event);
117 void OnMouseEntered(SubmenuView* source, const ui::MouseEvent& event); 117 void OnMouseEntered(SubmenuView* source, const ui::MouseEvent& event);
118 #if defined(OS_LINUX) 118 #if defined(OS_LINUX)
119 bool OnMouseWheel(SubmenuView* source, const ui::MouseWheelEvent& event); 119 bool OnMouseWheel(SubmenuView* source, const ui::MouseWheelEvent& event);
120 #endif 120 #endif
121 ui::GestureStatus OnGestureEvent(SubmenuView* source, 121 ui::EventResult OnGestureEvent(SubmenuView* source,
122 const ui::GestureEvent& event); 122 const ui::GestureEvent& event);
123 123
124 bool GetDropFormats( 124 bool GetDropFormats(
125 SubmenuView* source, 125 SubmenuView* source,
126 int* formats, 126 int* formats,
127 std::set<ui::OSExchangeData::CustomFormat>* custom_formats); 127 std::set<ui::OSExchangeData::CustomFormat>* custom_formats);
128 bool AreDropTypesRequired(SubmenuView* source); 128 bool AreDropTypesRequired(SubmenuView* source);
129 bool CanDrop(SubmenuView* source, const ui::OSExchangeData& data); 129 bool CanDrop(SubmenuView* source, const ui::OSExchangeData& data);
130 void OnDragEntered(SubmenuView* source, const ui::DropTargetEvent& event); 130 void OnDragEntered(SubmenuView* source, const ui::DropTargetEvent& event);
131 int OnDragUpdated(SubmenuView* source, const ui::DropTargetEvent& event); 131 int OnDragUpdated(SubmenuView* source, const ui::DropTargetEvent& event);
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 // How deep we are in nested message loops. This should be at most 2 (when 557 // How deep we are in nested message loops. This should be at most 2 (when
558 // showing a context menu from a menu). 558 // showing a context menu from a menu).
559 int message_loop_depth_; 559 int message_loop_depth_;
560 560
561 DISALLOW_COPY_AND_ASSIGN(MenuController); 561 DISALLOW_COPY_AND_ASSIGN(MenuController);
562 }; 562 };
563 563
564 } // namespace views 564 } // namespace views
565 565
566 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 566 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/link.cc ('k') | ui/views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698