Revert 238283 "Infobar system refactor."

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

 // Copyright (c) 2012 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_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 11 matching lines @@
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/widget/widget.h"
 
 
 // ExtensionInfoBarDelegate ----------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> ExtensionInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<ExtensionInfoBarDelegate> delegate) {
-  Browser* browser = delegate->browser_;
-  return scoped_ptr<InfoBar>(new ExtensionInfoBar(delegate.Pass(), browser));
+InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new ExtensionInfoBar(owner, this, browser_);
 }
 
 
 // ExtensionInfoBar ------------------------------------------------------------
 
 namespace {
 // The horizontal margin between the infobar icon and the Extension (HTML) view.
 const int kIconHorizontalMargin = 1;
 
 class MenuImageSource: public gfx::CanvasImageSource {
@@ skipping 27 matching lines @@
   static const int kDropArrowLeftMargin = 3;
 
   const gfx::ImageSkia icon_;
   const gfx::ImageSkia drop_image_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuImageSource);
 };
 
 }  // namespace
 
-ExtensionInfoBar::ExtensionInfoBar(
-    scoped_ptr<ExtensionInfoBarDelegate> delegate,
-    Browser* browser)
-    : InfoBarView(delegate.PassAs<InfoBarDelegate>()),
+ExtensionInfoBar::ExtensionInfoBar(InfoBarService* owner,
+                                   ExtensionInfoBarDelegate* delegate,
+                                   Browser* browser)
+    : InfoBarView(owner, delegate),
+      delegate_(delegate),
       browser_(browser),
       infobar_icon_(NULL),
       icon_as_menu_(NULL),
       icon_as_image_(NULL),
       weak_ptr_factory_(this) {
+  GetDelegate()->set_observer(this);
+
   int height = GetDelegate()->height();
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
 }
 
 ExtensionInfoBar::~ExtensionInfoBar() {
+  if (GetDelegate())
+    GetDelegate()->set_observer(NULL);
 }
 
 void ExtensionInfoBar::Layout() {
   InfoBarView::Layout();
 
   gfx::Size size = infobar_icon_->GetPreferredSize();
   infobar_icon_->SetBounds(StartX(), OffsetY(size), size.width(),
                            size.height());
 
   GetDelegate()->extension_view_host()->view()->SetBounds(
@@ skipping 49 matching lines @@
       gfx::Size(image_size, image_size),
       base::Bind(&ExtensionInfoBar::OnImageLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 int ExtensionInfoBar::ContentMinimumWidth() const {
   return infobar_icon_->GetPreferredSize().width() + kIconHorizontalMargin;
 
 }
 
+void ExtensionInfoBar::OnDelegateDeleted() {
+  delegate_ = NULL;
+}
+
 void ExtensionInfoBar::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
   const extensions::Extension* extension =
       GetDelegate()->extension_view_host()->extension();
   DCHECK(icon_as_menu_);
 
   scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
       new ExtensionContextMenuModel(extension, browser_);
@@ skipping 25 matching lines @@
   } else {
     icon_as_image_->SetImage(*icon);
   }
 
   infobar_icon_->SetVisible(true);
 
   Layout();
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {
-  return delegate()->AsExtensionInfoBarDelegate();
+  return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }