Moves ownership of MenuItemView to MenuRunner as well as responbility

chrome/browser/ui/views/wrench_menu.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 CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
 #define CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_
 #pragma once
 
 #include <map>
 #include <utility>
 
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_delegate.h"
 
 class BookmarkMenuDelegate;
 class Browser;
 
 namespace views {
 class MenuButton;
 class MenuItemView;
+class MenuRunner;
 class View;
 }  // namespace views
 
 // WrenchMenu adapts the WrenchMenuModel to view's menu related classes.
-class WrenchMenu : public base::RefCounted<WrenchMenu>,
-                   public views::MenuDelegate,
+class WrenchMenu : public views::MenuDelegate,
                    public BaseBookmarkModelObserver {
  public:
   explicit WrenchMenu(Browser* browser);
+  virtual ~WrenchMenu();
 
   void Init(ui::MenuModel* model);
 
   // Shows the menu relative to the specified view.
   void RunMenu(views::MenuButton* host);
 
   // MenuDelegate overrides:
   virtual std::wstring GetTooltipText(int id, const gfx::Point& p) OVERRIDE;
   virtual bool IsTriggerableEvent(views::MenuItemView* menu,
                                   const views::MouseEvent& e) OVERRIDE;
@@ skipping 22 matching lines @@
   virtual bool IsItemChecked(int id) const OVERRIDE;
   virtual bool IsCommandEnabled(int id) const OVERRIDE;
   virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE;
   virtual bool GetAccelerator(int id, views::Accelerator* accelerator) OVERRIDE;
   virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE;
 
   // BaseBookmarkModelObserver overrides:
   virtual void BookmarkModelChanged() OVERRIDE;
 
  private:
-  friend class base::RefCounted<WrenchMenu>;
-
   class CutCopyPasteView;
   class ZoomView;
 
   typedef std::pair<ui::MenuModel*,int> Entry;
   typedef std::map<int,Entry> IDToEntry;
 
-  virtual ~WrenchMenu();
-
   // Populates |parent| with all the child menus in |model|. Recursively invokes
   // |PopulateMenu| for any submenu. |next_id| is incremented for every menu
   // that is created.
   void PopulateMenu(views::MenuItemView* parent,
                     ui::MenuModel* model,
                     int* next_id);
 
   // Adds a new menu to |parent| to represent the MenuModel/index pair passed
   // in.
   views::MenuItemView* AppendMenuItem(views::MenuItemView* parent,
                                       ui::MenuModel* model,
                                       int index,
                                       ui::MenuModel::ItemType menu_type,
                                       int* next_id);
 
   // Invoked from the cut/copy/paste menus. Cancels the current active menu and
   // activates the menu item in |model| at |index|.
   void CancelAndEvaluate(ui::MenuModel* model, int index);
 
   // Creates the bookmark menu if necessary. Does nothing if already created or
   // the bookmark model isn't loaded.
   void CreateBookmarkMenu();
 
   // Returns true if |id| identifies a bookmark menu item.
   bool is_bookmark_command(int id) const {
     return bookmark_menu_delegate_.get() && id >= first_bookmark_command_id_;
   }
 
-  // The views menu.
-  scoped_ptr<views::MenuItemView> root_;
+  // The views menu. Owned by |menu_runner_|.
+  views::MenuItemView* root_;
+
+  scoped_ptr<views::MenuRunner> menu_runner_;
 
   // Maps from the ID as understood by MenuItemView to the model/index pair the
   // item came from.
   IDToEntry id_to_entry_;
 
   // Browser the menu is being shown for.
   Browser* browser_;
 
   // |CancelAndEvaluate| sets |selected_menu_model_| and |selected_index_|.
   // If |selected_menu_model_| is non-null after the menu completes
   // ActivatedAt is invoked. This is done so that ActivatedAt isn't invoked
   // while the message loop is nested.
   ui::MenuModel* selected_menu_model_;
   int selected_index_;
 
   // Used for managing the bookmark menu items.
   scoped_ptr<BookmarkMenuDelegate> bookmark_menu_delegate_;
 
   // Menu corresponding to IDC_BOOKMARKS_MENU.
   views::MenuItemView* bookmark_menu_;
 
   // ID to use for the items representing bookmarks in the bookmark menu.
   int first_bookmark_command_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WRENCH_MENU_H_