Extension context menu refactor

chrome/browser/views/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/content_setting_image_model.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/first_run_bubble.h"
 #endif
@@ skipping 1494 matching lines @@
   } else if (event.IsRightMouseButton()) {
     // Get the top left point of this button in screen coordinates.
     gfx::Point point = gfx::Point(0, 0);
     ConvertPointToScreen(this, &point);
 
     // Make the menu appear below the button.
     point.Offset(0, height());
 
     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;
   }
 
   ExecuteAction(button, false);  // inspect_with_devtools
 }
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
   ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
 }
 
@@ skipping 61 matching lines @@
           icon = iter->second;
       }
     }
 
     if (!icon.isNull())
       SetImage(&icon);
   }
   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
 }
 
 void LocationBarView::PageActionImageView::ExtensionPopupClosed(
     ExtensionPopup* popup) {
   DCHECK_EQ(popup_, popup);
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   popup_ = NULL;
 }
@@ skipping 92 matching lines @@
         page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,
             false);  // inspect_with_devtools
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }