Chromium Code Reviews| 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..9ccc89d977842b12c69853b2d1ac5c7f8b32f38b 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,9 +33,11 @@ namespace { |
| const int kMenuHorizontalMargin = 1; |
| } // namespace |
| -ExtensionInfoBar::ExtensionInfoBar(TabContentsWrapper* owner, |
| +ExtensionInfoBar::ExtensionInfoBar(Browser* browser, |
|
Peter Kasting
2011/09/29 17:39:20
Nit: This should probably go at the end of the lis
|
| + TabContentsWrapper* owner, |
| ExtensionInfoBarDelegate* delegate) |
| : InfoBarView(owner, delegate), |
| + browser_(browser), |
| delegate_(delegate), |
| menu_(NULL), |
| ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(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. |