Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/gtk/infobars/infobar_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_INFOBARS_INFOBAR_GTK_H_
 #define CHROME_BROWSER_UI_GTK_INFOBARS_INFOBAR_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
@@ skipping 15 matching lines @@
 class MenuModel;
 }
 
 class InfoBarGtk : public InfoBar,
                    public content::NotificationObserver {
  public:
   // Conversion from cairo colors to SkColor.
   typedef void (InfoBarGtk::*ColorGetter)(InfoBarDelegate::Type,
                                           double* r, double* g, double* b);
 
-  explicit InfoBarGtk(scoped_ptr<InfoBarDelegate> delegate);
+  InfoBarGtk(InfoBarService* owner, InfoBarDelegate* delegate);
   virtual ~InfoBarGtk();
 
+  // Must be called before we try to show the infobar.  Inits any widgets and
+  // related objects necessary.  This must be called only once during the
+  // infobar's life.
+  //
+  // NOTE: Subclasses who need to init widgets should override this function and
+  // explicitly call their parent's implementation first, then continue with
+  // further work they need to do.  Failing to call the parent implementation
+  // first (or at all), or setting up widgets in the constructor instead of
+  // here, will lead to bad side effects like crashing or having this function
+  // get called repeatedly.
+  virtual void InitWidgets();
+
   // Get the top level native GTK widget for this infobar.
   GtkWidget* widget() { return widget_.get(); }
 
   GdkColor GetBorderColor() const;
 
   // Returns the target height of the infobar if the bar is animating,
   // otherwise 0. We care about this number since we want to prevent
   // unnecessary renderer repaints while animating.
   int AnimatingHeight() const;
 
   SkColor ConvertGetColor(ColorGetter getter);
 
   // Retrieves the component colors for the infobar's background
   // gradient. (This varies by infobars and can be animated to change).
   virtual void GetTopColor(InfoBarDelegate::Type type,
                            double* r, double* g, double* b);
   virtual void GetBottomColor(InfoBarDelegate::Type type,
                               double* r, double* g, double* b);
 
  protected:
   // Spacing after message (and before buttons).
   static const int kEndOfLabelSpacing;
 
   // InfoBar:
-
-  // Inits any widgets and related objects necessary.
-  //
-  // NOTE: Subclasses who need to init widgets should override this function and
-  // explicitly call their parent's implementation first, then continue with
-  // further work they need to do.  Failing to call the parent implementation
-  // first (or at all), or setting up widgets in the constructor instead of
-  // here, will lead to bad side effects like crashing.
-  virtual void PlatformSpecificSetOwner() OVERRIDE;
-
   virtual void PlatformSpecificShow(bool animate) OVERRIDE;
   virtual void PlatformSpecificOnCloseSoon() OVERRIDE;
   virtual void PlatformSpecificOnHeightsRecalculated() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Styles the close button as if we're doing Chrome-stlye widget rendering.
@@ skipping 63 matching lines @@
   scoped_ptr<ui::GtkSignalRegistrar> signals_;
 
   // The current menu displayed. Can be null. We own this on the base class so
   // we can cancel the menu while we're closing.
   scoped_ptr<MenuGtk> menu_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_INFOBARS_INFOBAR_GTK_H_