Misc. infobar stuff:

chrome/browser/ui/views/infobars/extension_infobar.cc

 // Copyright (c) 2011 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/ui/views/infobars/extension_infobar.h"
 
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/widget.h"
 
 // ExtensionInfoBarDelegate ---------------------------------------------------
 
-InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
-  return new ExtensionInfoBar(this);
+InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(TabContentsWrapper* owner) {
+  return new ExtensionInfoBar(owner, this);
 }
 
 // ExtensionInfoBar -----------------------------------------------------------
 
 namespace {
 // The horizontal margin between the menu and the Extension (HTML) view.
 static const int kMenuHorizontalMargin = 1;
 };
 
-ExtensionInfoBar::ExtensionInfoBar(ExtensionInfoBarDelegate* delegate)
-    : InfoBarView(delegate),
+ExtensionInfoBar::ExtensionInfoBar(TabContentsWrapper* owner,
+                                   ExtensionInfoBarDelegate* delegate)
+    : InfoBarView(owner, delegate),
       delegate_(delegate),
       menu_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
   delegate->set_observer(this);
 
   ExtensionView* extension_view = delegate->extension_host()->view();
   int height = extension_view->GetPreferredSize().height();
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
 
   // Get notified of resize events for the ExtensionView.
@@ skipping 134 matching lines @@
                                                            NULL);
   }
 
   options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
   options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPLEFT);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
   return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }