Extension context menu refactor

chrome/browser/views/infobars/extension_infobar.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/infobars/extension_infobar.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#include "chrome/browser/extensions/extension_action_context_menu_model.h"
+#include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_host.h"
+#include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "grit/browser_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_2.h"
+#include "views/widget/widget.h"
 
 // The horizontal margin between the menu and the Extension (HTML) view.
 static const int kMenuHorizontalMargin = 1;
 
 // The amount of space to the right of the Extension (HTML) view (to avoid
 // overlapping the close button for the InfoBar).
 static const int kFarRightMargin = 30;
 
 // The margin between the extension icon and the drop-down arrow bitmap.
 static const int kDropArrowLeftMargin = 3;
@@ skipping 54 matching lines @@
                   (height() - sz.height()) / 2,
                    sz.width(), sz.height());
   x += sz.width() + kMenuHorizontalMargin;
 
   // Layout the ExtensionView, showing the HTML InfoBar.
   ExtensionView* view = delegate_->extension_host()->view();
   view->SetBounds(x, 0, width() - x - kFarRightMargin - 1, height() - 1);
 }
 
 void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) {
-  if (!options_menu_contents_.get())
-    options_menu_contents_.reset(new ExtensionActionContextMenuModel(
-        delegate_->extension_host()->extension(),
-        // Do not include "Inspect Popup" in menu:
-        NULL,  // ExtensionAction
-        NULL,  // PrefService
-        NULL));  // ExtensionActionContextMenuModel::MenuDelegate
+  if (!options_menu_contents_.get()) {
+    Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
+        ::GetAncestor(source->GetWidget()->GetNativeView(), GA_ROOT))->
+            browser();
+    options_menu_contents_.reset(new ExtensionContextMenuModel(
+        delegate_->extension_host()->extension(), browser, NULL));
+  }
 
   options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
   options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPLEFT);
 }
 
 void ExtensionInfoBar::SetupIconAndMenu() {
   SkBitmap icon;
 
   ExtensionResource icon_resource;
   Extension::Icons size = delegate_->extension_host()->extension()->
@@ skipping 29 matching lines @@
                         image_size + kDropArrowLeftMargin,
                         image_size / 2);
   menu_->SetIcon(canvas->ExtractBitmap());
 
   AddChildView(menu_);
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
   return new ExtensionInfoBar(this);
 }