Extension context menu refactor

chrome/browser/views/extensions/browser_action_overflow_menu_controller.h

Index: chrome/browser/views/extensions/browser_action_overflow_menu_controller.h
===================================================================
--- chrome/browser/views/extensions/browser_action_overflow_menu_controller.h	(revision 41960)
+++ chrome/browser/views/extensions/browser_action_overflow_menu_controller.h	(working copy)
@@ -8,12 +8,18 @@
 #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 {
@@ -98,6 +104,12 @@
   // 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);
 };