Add InitWidgets() phase for GTK infobars.

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_host.h"
 #include "chrome/browser/extensions/image_loader.h"
@@ skipping 17 matching lines @@
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 ExtensionInfoBarGtk::ExtensionInfoBarGtk(InfoBarService* owner,
                                          ExtensionInfoBarDelegate* delegate)
     : InfoBarGtk(owner, delegate),
       delegate_(delegate),
       view_(NULL),
       button_(NULL),
       icon_(NULL),
+      alignment_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   delegate->set_observer(this);
 
-  // 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.
-  close_button_->ForceChromeTheme();
-
   int height = delegate->height();
   SetBarTargetHeight((height > 0) ? (height + kSeparatorLineHeight) : 0);
-
-  BuildWidgets();
 }
 
 ExtensionInfoBarGtk::~ExtensionInfoBarGtk() {
   if (delegate_)
     delegate_->set_observer(NULL);
 }
 
 void ExtensionInfoBarGtk::PlatformSpecificHide(bool animate) {
-  // This view is not owned by us; we can't unparent it because we aren't the
-  // owning container.
+  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::OnImageLoaded(const gfx::Image& image) {
   if (!delegate_)
     return;  // The delegate can go away while we asynchronously load images.
 
+  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
     icon = image.ToImageSkia();
 
   SkBitmap bitmap;
@@ skipping 13 matching lines @@
     bitmap = canvas->ExtractImageRep().sk_bitmap();
   } else {
     bitmap = *icon->bitmap();
   }
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
   gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), pixbuf);
   g_object_unref(pixbuf);
 }
 
-void ExtensionInfoBarGtk::BuildWidgets() {
+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.
+  close_button_->ForceChromeTheme();
+
   icon_ = gtk_image_new();
   gtk_misc_set_alignment(GTK_MISC(icon_), 0.5, 0.5);
 
   const extensions::Extension* extension =
       delegate_->extension_host()->extension();
 
   if (extension->ShowConfigureContextMenus()) {
     button_ = gtk_chrome_button_new();
     gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button_), FALSE);
     g_object_set_data(G_OBJECT(button_), "left-align-popup",
@@ skipping 47 matching lines @@
 void ExtensionInfoBarGtk::StoppedShowing() {
   if (button_)
     gtk_chrome_button_unset_paint_state(GTK_CHROME_BUTTON(button_));
 }
 
 void ExtensionInfoBarGtk::OnDelegateDeleted() {
   delegate_ = NULL;
 }
 
 Browser* ExtensionInfoBarGtk::GetBrowser() {
+  DCHECK(icon_);
   // Get the Browser object this infobar is attached to.
   GtkWindow* parent = platform_util::GetTopLevel(icon_);
   if (!parent)
     return NULL;
 
   return BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent)->browser();
 }
 
 ExtensionContextMenuModel* ExtensionInfoBarGtk::BuildMenuModel() {
   const extensions::Extension* extension = delegate_->extension();
@@ skipping 40 matching lines @@
   // We also need to draw our infobar arrows over the renderer.
   static_cast<InfoBarContainerGtk*>(container())->
       PaintInfobarBitsOn(sender, event, this);
 
   return FALSE;
 }
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   return new ExtensionInfoBarGtk(owner, this);
 }