Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/gtk/infobars/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/infobar_gtk.h"
 
 #include "base/debug/trace_event.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 34 matching lines @@
 const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight;
 const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
 const int InfoBar::kDefaultBarTargetHeight = 36;
 
 
 // InfoBarGtk -----------------------------------------------------------------
 
 // static
 const int InfoBarGtk::kEndOfLabelSpacing = 6;
 
-InfoBarGtk::InfoBarGtk(scoped_ptr<InfoBarDelegate> delegate)
-    : InfoBar(delegate.Pass()),
+InfoBarGtk::InfoBarGtk(InfoBarService* owner, InfoBarDelegate* delegate)
+    : InfoBar(owner, delegate),
       bg_box_(NULL),
       hbox_(NULL),
       theme_service_(NULL),
       signals_(new ui::GtkSignalRegistrar) {
 }
 
 InfoBarGtk::~InfoBarGtk() {
 }
 
-GdkColor InfoBarGtk::GetBorderColor() const {
-  DCHECK(theme_service_);
-  return theme_service_->GetBorderColor();
-}
-
-int InfoBarGtk::AnimatingHeight() const {
-  return animation().is_animating() ? bar_target_height() : 0;
-}
-
-SkColor InfoBarGtk::ConvertGetColor(ColorGetter getter) {
-  double r, g, b;
-  (this->*getter)(delegate()->GetInfoBarType(), &r, &g, &b);
-  return SkColorSetARGB(255, 255 * r, 255 * g, 255 * b);
-}
-
-void InfoBarGtk::GetTopColor(InfoBarDelegate::Type type,
-                             double* r, double* g, double* b) {
-  GetBackgroundColor(InfoBar::GetTopColor(type), r, g, b);
-}
-
-void InfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
-                                double* r, double* g, double* b) {
-  GetBackgroundColor(InfoBar::GetBottomColor(type), r, g, b);
-}
-
-void InfoBarGtk::PlatformSpecificSetOwner() {
+void InfoBarGtk::InitWidgets() {
   DCHECK(owner());
   DCHECK(!theme_service_);
   theme_service_ = GtkThemeService::GetFrom(Profile::FromBrowserContext(
       owner()->web_contents()->GetBrowserContext()));
 
   // Create |hbox_| and pad the sides.
   hbox_ = gtk_hbox_new(FALSE, kElementPadding);
 
   // Make the whole infor bar horizontally shrinkable.
   gtk_widget_set_size_request(hbox_, 0, -1);
@@ skipping 30 matching lines @@
 
   g_signal_connect(widget_.get(), "child-size-request",
                    G_CALLBACK(OnChildSizeRequestThunk),
                    this);
 
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   UpdateBorderColor();
 }
 
+GdkColor InfoBarGtk::GetBorderColor() const {
+  DCHECK(theme_service_);
+  return theme_service_->GetBorderColor();
+}
+
+int InfoBarGtk::AnimatingHeight() const {
+  return animation().is_animating() ? bar_target_height() : 0;
+}
+
+SkColor InfoBarGtk::ConvertGetColor(ColorGetter getter) {
+  double r, g, b;
+  (this->*getter)(delegate()->GetInfoBarType(), &r, &g, &b);
+  return SkColorSetARGB(255, 255 * r, 255 * g, 255 * b);
+}
+
+void InfoBarGtk::GetTopColor(InfoBarDelegate::Type type,
+                             double* r, double* g, double* b) {
+  GetBackgroundColor(InfoBar::GetTopColor(type), r, g, b);
+}
+
+void InfoBarGtk::GetBottomColor(InfoBarDelegate::Type type,
+                                double* r, double* g, double* b) {
+  GetBackgroundColor(InfoBar::GetBottomColor(type), r, g, b);
+}
+
 void InfoBarGtk::PlatformSpecificShow(bool animate) {
   DCHECK(bg_box_);
 
   DCHECK(widget());
   gtk_widget_show_all(widget());
   gtk_widget_set_size_request(widget(), -1, bar_height());
 
   GdkWindow* gdk_window = gtk_widget_get_window(bg_box_);
   if (gdk_window)
     gdk_window_lower(gdk_window);
@@ skipping 115 matching lines @@
 }
 
 void InfoBarGtk::UpdateBorderColor() {
   DCHECK(widget());
   gtk_widget_queue_draw(widget());
 }
 
 void InfoBarGtk::OnCloseButton(GtkWidget* button) {
   // If we're not owned, we're already closing, so don't call
   // InfoBarDismissed(), since this can lead to us double-recording dismissals.
-  if (owner())
+  if (delegate() && owner())
     delegate()->InfoBarDismissed();
   RemoveSelf();
 }
 
 gboolean InfoBarGtk::OnBackgroundExpose(GtkWidget* sender,
                                         GdkEventExpose* event) {
   TRACE_EVENT0("ui::gtk", "InfoBarGtk::OnBackgroundExpose");
   DCHECK(theme_service_);
 
   GtkAllocation allocation;
@@ skipping 36 matching lines @@
   }
 
   return FALSE;
 }
 
 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded,
                                     GtkWidget* child,
                                     GtkRequisition* requisition) {
   requisition->height = -1;
 }