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

Unified 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 and merge with http://crrev.com/269819 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 910d3809f8276930c4e630f7cf2cfa84dedeabd1..d7aaebf957bb57fa2f507d877d9ea19183c2b62c 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -37,6 +37,7 @@ namespace views {
class MenuButton;
class MenuHostRootView;
class MenuItemView;
+class MenuMessageLoop;
class MouseEvent;
class SubmenuView;
class View;
@@ -575,10 +576,6 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
internal::MenuControllerDelegate* delegate_;
- // How deep we are in nested message loops. This should be at most 2 (when
- // showing a context menu from a menu).
- int message_loop_depth_;
-
views::MenuConfig menu_config_;
// The timestamp of the event which closed the menu - or 0 otherwise.
@@ -598,7 +595,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
// Set to true if the menu item was selected by touch.
bool item_selected_by_touch_;
- scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_;
+ scoped_ptr<MenuMessageLoop> message_loop_;
DISALLOW_COPY_AND_ASSIGN(MenuController);
};

Powered by Google App Engine
This is Rietveld 408576698