Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.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/gtk/infobars/extension_infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 13 matching lines @@
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 
 // ExtensionInfoBarDelegate ---------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> ExtensionInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<ExtensionInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new ExtensionInfoBarGtk(delegate.Pass()));
+InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new ExtensionInfoBarGtk(owner, this);
 }
 
 
 // ExtensionInfoBarGtk --------------------------------------------------------
 
-ExtensionInfoBarGtk::ExtensionInfoBarGtk(
-    scoped_ptr<ExtensionInfoBarDelegate> delegate)
-    : InfoBarGtk(delegate.PassAs<InfoBarDelegate>()),
+ExtensionInfoBarGtk::ExtensionInfoBarGtk(InfoBarService* owner,
+                                         ExtensionInfoBarDelegate* delegate)
+    : InfoBarGtk(owner, delegate),
+      delegate_(delegate),
       view_(NULL),
       button_(NULL),
       icon_(NULL),
       alignment_(NULL),
       weak_ptr_factory_(this) {
+  GetDelegate()->set_observer(this);
+
   int height = GetDelegate()->height();
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
 }
 
 ExtensionInfoBarGtk::~ExtensionInfoBarGtk() {
+  if (GetDelegate())
+    GetDelegate()->set_observer(NULL);
 }
 
-void ExtensionInfoBarGtk::PlatformSpecificSetOwner() {
-  InfoBarGtk::PlatformSpecificSetOwner();
+void ExtensionInfoBarGtk::PlatformSpecificHide(bool animate) {
+  DCHECK(view_);
+  DCHECK(alignment_);
+  gtk_util::RemoveAllChildren(alignment_);
+}
+
+void ExtensionInfoBarGtk::GetTopColor(InfoBarDelegate::Type type,
+                                      double* r, double* g, double* b) {
+  // Extension infobars are always drawn with chrome-theme colors.
+  *r = *g = *b = 233.0 / 255.0;
+}
+
+void ExtensionInfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
+                                         double* r, double* g, double* b) {
+  *r = *g = *b = 218.0 / 255.0;
+}
+
+void ExtensionInfoBarGtk::InitWidgets() {
+  InfoBarGtk::InitWidgets();
 
   // Always render the close button as if we were doing chrome style widget
   // rendering. For extension infobars, we force chrome style rendering because
   // extension authors are going to expect to match the declared gradient in
   // extensions_infobar.css, and the close button provided by some GTK+ themes
   // won't look good on this background.
   ForceCloseButtonToUseChromeTheme();
 
   icon_ = gtk_image_new();
   gtk_misc_set_alignment(GTK_MISC(icon_), 0.5, 0.5);
@@ skipping 45 matching lines @@
   if (button_) {
     signals()->Connect(button_, "button-press-event",
                        G_CALLBACK(&OnButtonPressThunk), this);
   }
   signals()->Connect(view_->native_view(), "expose-event",
                      G_CALLBACK(&OnExposeThunk), this);
   signals()->Connect(view_->native_view(), "size_allocate",
                      G_CALLBACK(&OnSizeAllocateThunk), this);
 }
 
-void ExtensionInfoBarGtk::PlatformSpecificHide(bool animate) {
-  DCHECK(view_);
-  DCHECK(alignment_);
-  gtk_util::RemoveAllChildren(alignment_);
-}
-
-void ExtensionInfoBarGtk::GetTopColor(InfoBarDelegate::Type type,
-                                      double* r, double* g, double* b) {
-  // Extension infobars are always drawn with chrome-theme colors.
-  *r = *g = *b = 233.0 / 255.0;
-}
-
-void ExtensionInfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
-                                         double* r, double* g, double* b) {
-  *r = *g = *b = 218.0 / 255.0;
-}
-
 void ExtensionInfoBarGtk::StoppedShowing() {
   if (button_)
     gtk_chrome_button_unset_paint_state(GTK_CHROME_BUTTON(button_));
 }
 
+void ExtensionInfoBarGtk::OnDelegateDeleted() {
+  delegate_ = NULL;
+}
+
 void ExtensionInfoBarGtk::OnImageLoaded(const gfx::Image& image) {
 
   DCHECK(icon_);
   // TODO(erg): IDR_EXTENSIONS_SECTION should have an IDR_INFOBAR_EXTENSIONS
   // icon of the correct size with real subpixel shading and such.
   const gfx::ImageSkia* icon = NULL;
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (image.IsEmpty())
     icon = rb.GetImageSkiaNamed(IDR_EXTENSIONS_SECTION);
   else
@@ skipping 17 matching lines @@
   } else {
     bitmap = *icon->bitmap();
   }
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
   gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), pixbuf);
   g_object_unref(pixbuf);
 }
 
 ExtensionInfoBarDelegate* ExtensionInfoBarGtk::GetDelegate() {
-  return delegate()->AsExtensionInfoBarDelegate();
+  return delegate_ ? delegate_->AsExtensionInfoBarDelegate() : NULL;
 }
 
 Browser* ExtensionInfoBarGtk::GetBrowser() {
   DCHECK(icon_);
   // Get the Browser object this infobar is attached to.
   GtkWindow* parent = platform_util::GetTopLevel(icon_);
   return parent ?
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent)->browser() :
       NULL;
 }
@@ skipping 39 matching lines @@
 gboolean ExtensionInfoBarGtk::OnExpose(GtkWidget* sender,
                                        GdkEventExpose* event) {
   TRACE_EVENT0("ui::gtk", "ExtensionInfoBarGtk::OnExpose");
 
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }