Moves ownership of MenuItemView to MenuRunner as well as responbility

views/controls/menu/menu_controller.h

 // Copyright (c) 2011 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 VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 14 matching lines @@
 
 namespace views {
 
 class DropTargetEvent;
 class MenuButton;
 class MenuHostRootView;
 class MouseEvent;
 class SubmenuView;
 class View;
 
+namespace internal {
+class MenuControllerDelegate;
+class MenuRunnerImpl;
+}
+
 // MenuController -------------------------------------------------------------
 
 // MenuController is used internally by the various menu classes to manage
 // showing, selecting and drag/drop for menus. All relevant events are
 // forwarded to the MenuController from SubmenuView and MenuHost.
 class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {
  public:
-  friend class MenuHostRootView;
-  friend class MenuItemView;
-  friend class SubmenuView;
-
   // Enumeration of how the menu should exit.
   enum ExitType {
     // Don't exit.
     EXIT_NONE,
 
     // All menus, including nested, should be exited.
     EXIT_ALL,
 
     // Only the outermost menu should be exited.
     EXIT_OUTERMOST,
@@ skipping 59 matching lines @@
 
   // Invoked from the scroll buttons of the MenuScrollViewContainer.
   void OnDragEnteredScrollButton(SubmenuView* source, bool is_up);
   void OnDragExitedScrollButton(SubmenuView* source);
 
   // Invoked once for any Widget activation change.  This allows the menu
   // to be canceled if the window manager changes the active window.
   void OnWidgetActivationChanged();
 
  private:
+  friend class internal::MenuRunnerImpl;
+  friend class MenuHostRootView;
+  friend class MenuItemView;
+  friend class SubmenuView;
+
   class MenuScrollTask;
 
   struct SelectByCharDetails;
 
   // Values supplied to SetSelection.
   enum SetSelectionTypes {
     SELECTION_DEFAULT               = 0,
 
     // If set submenus are opened immediately, otherwise submenus are only
     // openned after a timer fires.
@@ skipping 67 matching lines @@
 
   // Sets the selection to menu_item a value of NULL unselects
   // everything. |types| is a bitmask of |SetSelectionTypes|.
   //
   // Internally this updates pending_state_ immediatley. state_ is only updated
   // immediately if SELECTION_UPDATE_IMMEDIATELY is set. If
   // SELECTION_UPDATE_IMMEDIATELY is not set CommitPendingSelection is invoked
   // to show/hide submenus and update state_.
   void SetSelection(MenuItemView* menu_item, int types);
 
-  // Sets the active MenuController.
-  static void SetActiveInstance(MenuController* controller);
-
 #if defined(OS_WIN)
   // Dispatcher method. This returns true if the menu was canceled, or
   // if the message is such that the menu should be closed.
   virtual bool Dispatch(const MSG& msg);
 #elif defined(TOUCH_UI)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent);
 #else
   virtual bool Dispatch(GdkEvent* event);
 #endif
 
   // Key processing. The return value of this is returned from Dispatch.
   // In other words, if this returns false (which happens if escape was
   // pressed, or a matching mnemonic was found) the message loop returns.
 #if defined(OS_WIN)
   bool OnKeyDown(int key_code, const MSG& msg);
 #else
   bool OnKeyDown(int key_code);
 #endif
 
-  // Creates a MenuController. If blocking is true, Run blocks the caller
-  explicit MenuController(bool blocking);
+  // Creates a MenuController. If |blocking| is true a nested message loop is
+  // started in |Run|.
+  MenuController(bool blocking, internal::MenuControllerDelegate* delegate);
 
   virtual ~MenuController();
 
   // If there is a hot tracked view AcceleratorPressed is invoked on it and
   // true is returned.
   bool SendAcceleratorToHotTrackedView();
 
   void UpdateInitialLocation(const gfx::Rect& bounds,
                              MenuItemView::AnchorPosition position);
 
@@ skipping 241 matching lines @@
   // Task for scrolling the menu. If non-null indicates a scroll is currently
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   MenuButton* menu_button_;
 
   // If non-null mouse drag events are forwarded to this view. See
   // UpdateActiveMouseView for details.
   View* active_mouse_view_;
 
+  internal::MenuControllerDelegate* delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_