Extension context menu refactor

chrome/browser/views/extensions/browser_action_overflow_menu_controller.h

 // Copyright (c) 2010 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_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 #define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 
 #include <set>
 #include <vector>
 
+#include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "views/controls/menu/menu_delegate.h"
 
 class BrowserActionsContainer;
 class BrowserActionView;
-class ExtensionActionContextMenu;
+class ExtensionContextMenuModel;
+
+namespace views {
+class Menu2;
+}
 
 // This class handles the overflow menu for browser actions (showing the menu,
 // drag and drop, etc). This class manages its own lifetime.
 class BrowserActionOverflowMenuController : public views::MenuDelegate {
  public:
   // The observer is notified prior to the menu being deleted.
   class Observer {
    public:
     virtual void NotifyMenuDeleted(
         BrowserActionOverflowMenuController* controller) = 0;
@@ skipping 65 matching lines @@
   // won't show all items, just the one starting at |start_index| and above.
   const std::vector<BrowserActionView*>* views_;
 
   // The index into the BrowserActionView vector, indicating where to start
   // picking browser actions to draw.
   int start_index_;
 
   // Whether this controller is being used for drop.
   bool for_drop_;
 
+  // The browser action context menu and model.
+  scoped_ptr<ExtensionContextMenuModel> context_menu_contents_;
+  scoped_ptr<views::Menu2> context_menu_menu_;
+
+  friend class DeleteTask<BrowserActionOverflowMenuController>;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserActionOverflowMenuController);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_