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); |
}; |