Merge 269819 "views: Terminate the nested message-loop correctly..."

ui/views/controls/menu/menu_controller.h

Index: ui/views/controls/menu/menu_controller.h
===================================================================
--- ui/views/controls/menu/menu_controller.h	(revision 274103)
+++ ui/views/controls/menu/menu_controller.h	(working copy)
@@ -154,6 +154,7 @@
   friend class internal::MenuEventDispatcher;
   friend class internal::MenuMessagePumpDispatcher;
   friend class internal::MenuRunnerImpl;
+  friend class MenuControllerTest;
   friend class MenuHostRootView;
   friend class MenuItemView;
   friend class SubmenuView;
@@ -475,9 +476,12 @@
   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;