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

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

Issue 1679923003: Cleanup: Remove MenuEventDispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_event_dispatcher.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 #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 <stddef.h> 10 #include <stddef.h>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class MouseEvent; 45 class MouseEvent;
46 class SubmenuView; 46 class SubmenuView;
47 class View; 47 class View;
48 48
49 #if defined(USE_AURA) 49 #if defined(USE_AURA)
50 class MenuKeyEventHandler; 50 class MenuKeyEventHandler;
51 #endif 51 #endif
52 52
53 namespace internal { 53 namespace internal {
54 class MenuControllerDelegate; 54 class MenuControllerDelegate;
55 class MenuEventDispatcher;
56 class MenuRunnerImpl; 55 class MenuRunnerImpl;
57 } 56 }
58 57
59 namespace test { 58 namespace test {
60 class MenuControllerTest; 59 class MenuControllerTest;
61 } 60 }
62 61
63 // MenuController ------------------------------------------------------------- 62 // MenuController -------------------------------------------------------------
64 63
65 // MenuController is used internally by the various menu classes to manage 64 // MenuController is used internally by the various menu classes to manage
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // WidgetObserver overrides: 194 // WidgetObserver overrides:
196 void OnWidgetDestroying(Widget* widget) override; 195 void OnWidgetDestroying(Widget* widget) override;
197 196
198 // Only used for testing. 197 // Only used for testing.
199 bool IsCancelAllTimerRunningForTest(); 198 bool IsCancelAllTimerRunningForTest();
200 199
201 // Only used for testing. 200 // Only used for testing.
202 static void TurnOffMenuSelectionHoldForTest(); 201 static void TurnOffMenuSelectionHoldForTest();
203 202
204 private: 203 private:
205 friend class internal::MenuEventDispatcher;
206 friend class internal::MenuRunnerImpl; 204 friend class internal::MenuRunnerImpl;
207 friend class test::MenuControllerTest; 205 friend class test::MenuControllerTest;
208 friend class MenuKeyEventHandler; 206 friend class MenuKeyEventHandler;
209 friend class MenuHostRootView; 207 friend class MenuHostRootView;
210 friend class MenuItemView; 208 friend class MenuItemView;
211 friend class SubmenuView; 209 friend class SubmenuView;
212 210
213 class MenuScrollTask; 211 class MenuScrollTask;
214 212
215 struct SelectByCharDetails; 213 struct SelectByCharDetails;
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 #if defined(USE_AURA) 704 #if defined(USE_AURA)
707 scoped_ptr<MenuKeyEventHandler> key_event_handler_; 705 scoped_ptr<MenuKeyEventHandler> key_event_handler_;
708 #endif 706 #endif
709 707
710 DISALLOW_COPY_AND_ASSIGN(MenuController); 708 DISALLOW_COPY_AND_ASSIGN(MenuController);
711 }; 709 };
712 710
713 } // namespace views 711 } // namespace views
714 712
715 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 713 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698