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

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

Issue 267593005: Refactor menu controller to isolate aura dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to master. Fixes for tapted. Created 6 years, 7 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
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 19 matching lines...) Expand all
30 namespace ui { 30 namespace ui {
31 class NativeTheme; 31 class NativeTheme;
32 class OSExchangeData; 32 class OSExchangeData;
33 class ScopedEventDispatcher; 33 class ScopedEventDispatcher;
34 } 34 }
35 namespace views { 35 namespace views {
36 36
37 class MenuButton; 37 class MenuButton;
38 class MenuHostRootView; 38 class MenuHostRootView;
39 class MenuItemView; 39 class MenuItemView;
40 class MenuMessageLoop;
40 class MouseEvent; 41 class MouseEvent;
41 class SubmenuView; 42 class SubmenuView;
42 class View; 43 class View;
43 44
44 namespace internal { 45 namespace internal {
45 class MenuControllerDelegate; 46 class MenuControllerDelegate;
46 class MenuEventDispatcher; 47 class MenuEventDispatcher;
47 class MenuMessagePumpDispatcher; 48 class MenuMessagePumpDispatcher;
48 class MenuRunnerImpl; 49 class MenuRunnerImpl;
49 } 50 }
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 // screen coordinates). Otherwise this will be (0, 0). 588 // screen coordinates). Otherwise this will be (0, 0).
588 gfx::Point menu_start_mouse_press_loc_; 589 gfx::Point menu_start_mouse_press_loc_;
589 590
590 // Controls behavior differences between a combobox and other types of menu 591 // Controls behavior differences between a combobox and other types of menu
591 // (like a context menu). 592 // (like a context menu).
592 bool is_combobox_; 593 bool is_combobox_;
593 594
594 // Set to true if the menu item was selected by touch. 595 // Set to true if the menu item was selected by touch.
595 bool item_selected_by_touch_; 596 bool item_selected_by_touch_;
596 597
597 scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_; 598 scoped_ptr<MenuMessageLoop> message_loop_;
598 599
599 DISALLOW_COPY_AND_ASSIGN(MenuController); 600 DISALLOW_COPY_AND_ASSIGN(MenuController);
600 }; 601 };
601 602
602 } // namespace views 603 } // namespace views
603 604
604 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_ 605 #endif // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698