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 5821eec5a312e746e1a99ac8a74f8eb8d1246255..910d3809f8276930c4e630f7cf2cfa84dedeabd1 100644 |
--- a/ui/views/controls/menu/menu_controller.h |
+++ b/ui/views/controls/menu/menu_controller.h |
@@ -150,6 +150,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { |
friend class internal::MenuEventDispatcher; |
friend class internal::MenuMessagePumpDispatcher; |
friend class internal::MenuRunnerImpl; |
+ friend class MenuControllerTest; |
friend class MenuHostRootView; |
friend class MenuItemView; |
friend class SubmenuView; |
@@ -471,9 +472,12 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { |
void SetActiveMouseView(View* view); |
View* GetActiveMouseView(); |
- // Sets exit type. |
+ // Sets exit type. Calling this can terminate the active nested message-loop. |
void SetExitType(ExitType type); |
+ // Terminates the current nested message-loop. |
+ void TerminateNestedMessageLoop(); |
+ |
// Returns true if SetExitType() should quit the message loop. |
bool ShouldQuitNow() const; |