| Index: chrome/browser/ui/views/infobars/extension_infobar.cc
|
| diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
|
| index f9e5fd1a03bd1cff9d03f556271cd86aa27f7bb9..ecf2677563cf44c24a64380b85342dafe226b060 100644
|
| --- a/chrome/browser/ui/views/infobars/extension_infobar.cc
|
| +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
|
| @@ -23,7 +23,7 @@
|
| // ExtensionInfoBarDelegate ----------------------------------------------------
|
|
|
| InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
|
| - return new ExtensionInfoBar(owner, this);
|
| + return new ExtensionInfoBar(browser_, owner, this);
|
| }
|
|
|
| // ExtensionInfoBar ------------------------------------------------------------
|
| @@ -33,10 +33,12 @@ namespace {
|
| const int kMenuHorizontalMargin = 1;
|
| } // namespace
|
|
|
| -ExtensionInfoBar::ExtensionInfoBar(TabContentsWrapper* owner,
|
| +ExtensionInfoBar::ExtensionInfoBar(Browser* browser,
|
| + TabContentsWrapper* owner,
|
| ExtensionInfoBarDelegate* delegate)
|
| : InfoBarView(owner, delegate),
|
| delegate_(delegate),
|
| + browser_(browser),
|
| menu_(NULL),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
|
| delegate->set_observer(this);
|
| @@ -141,11 +143,8 @@ void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) {
|
| if (!extension->ShowConfigureContextMenus())
|
| return;
|
|
|
| - Browser* browser = BrowserView::GetBrowserViewForNativeWindow(
|
| - platform_util::GetTopLevel(source->GetWidget()->GetNativeView()))->
|
| - browser();
|
| scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
|
| - new ExtensionContextMenuModel(extension, browser, NULL);
|
| + new ExtensionContextMenuModel(extension, browser_, NULL);
|
| DCHECK_EQ(source, menu_);
|
| RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
|
| // TODO(pkasting): this may be deleted after rewrite.
|
|
|