Extension context menu refactor

chrome/browser/views/location_bar_view.cc

Index: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc	(revision 41960)
+++ chrome/browser/views/location_bar_view.cc	(working copy)
@@ -28,6 +28,7 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
+#include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/content_blocked_bubble_contents.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
@@ -1542,14 +1543,12 @@
 
     Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
         page_action()->extension_id(), false);
-
-    if (!context_menu_.get())
-      context_menu_.reset(new ExtensionActionContextMenu());
-    context_menu_->Run(extension,
-                       extension->page_action(),
-                       this,  // ExtensionActionContextMenuModel::Delegate
-                       profile_->GetPrefs(),
-                       point);
+    Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
+        ::GetAncestor(GetWidget()->GetNativeView(), GA_ROOT))->browser();
+    context_menu_contents_.reset(new ExtensionContextMenuModel(
+        extension, browser, this));
+    context_menu_menu_.reset(new views::Menu2(context_menu_contents_.get()));
+    context_menu_menu_->RunContextMenuAt(point);
     return;
   }
 
@@ -1631,8 +1630,8 @@
   SetVisible(visible);
 }
 
-void LocationBarView::PageActionImageView::ShowPopupForDevToolsWindow(
-    Extension* extension, ExtensionAction* extension_action) {
+void LocationBarView::PageActionImageView::InspectPopup(
+    ExtensionAction* action) {
   ExecuteAction(1,  // left-click
                 true);  // inspect_with_devtools
 }