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

ui/views/controls/menu/menu_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 136 matching lines @@
   // WidgetObserver overrides:
   virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
 
   // Only used for testing.
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
   friend class internal::MenuEventDispatcher;
   friend class internal::MenuMessagePumpDispatcher;
   friend class internal::MenuRunnerImpl;
+  friend class MenuControllerTest;
   friend class MenuHostRootView;
   friend class MenuItemView;
   friend class SubmenuView;
 
   class MenuScrollTask;
 
   struct SelectByCharDetails;
 
   // Values supplied to SetSelection.
   enum SetSelectionTypes {
@@ skipping 301 matching lines @@
                                     const ui::MouseEvent& event);
 
   // Sends a mouse capture lost event to the current active mouse view and sets
   // it to null.
   void SendMouseCaptureLostToActiveView();
 
   // Sets/gets the active mouse view. See UpdateActiveMouseView() for details.
   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;
 
   // Handles the mouse location event on the submenu |source|.
   void HandleMouseLocation(SubmenuView* source,
                            const gfx::Point& mouse_location);
 
   // Retrieve an appropriate Screen.
   gfx::Screen* GetScreen();
 
@@ skipping 108 matching lines @@
   bool item_selected_by_touch_;
 
   scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_