Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc

 // Copyright (c) 2011 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_container_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <utility>
 
+#include "base/message_loop/message_loop.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/gtk_compat.h"
@@ skipping 24 matching lines @@
   return sum;
 }
 
 bool InfoBarContainerGtk::ContainsInfobars() const {
   return !infobars_gtk_.empty();
 }
 
 void InfoBarContainerGtk::PlatformSpecificAddInfoBar(InfoBar* infobar,
                                                      size_t position) {
   InfoBarGtk* infobar_gtk = static_cast<InfoBarGtk*>(infobar);
+  infobar_gtk->InitWidgets();
   infobars_gtk_.insert(infobars_gtk_.begin() + position, infobar_gtk);
 
   if (infobars_gtk_.back() == infobar_gtk) {
     gtk_box_pack_start(GTK_BOX(widget()), infobar_gtk->widget(),
                        FALSE, FALSE, 0);
   } else {
     // Clear out our container and then repack it to make sure everything is in
     // the right order.
     gtk_util::RemoveAllChildren(widget());
 
     // Repack our container.
     for (std::vector<InfoBarGtk*>::const_iterator it = infobars_gtk_.begin();
          it != infobars_gtk_.end(); ++it) {
       gtk_box_pack_start(GTK_BOX(widget()), (*it)->widget(),
                          FALSE, FALSE, 0);
     }
   }
 }
 
 void InfoBarContainerGtk::PlatformSpecificRemoveInfoBar(InfoBar* infobar) {
   InfoBarGtk* infobar_gtk = static_cast<InfoBarGtk*>(infobar);
   gtk_container_remove(GTK_CONTAINER(widget()), infobar_gtk->widget());
 
   std::vector<InfoBarGtk*>::iterator it =
       std::find(infobars_gtk_.begin(), infobars_gtk_.end(), infobar);
   if (it != infobars_gtk_.end())
     infobars_gtk_.erase(it);
+
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, infobar);
 }
 
 void InfoBarContainerGtk::PlatformSpecificInfoBarStateChanged(
     bool is_animating) {
   // Force a redraw of all infobars since something has a new height and we
   // need to make sure we animate our arrows.
   for (std::vector<InfoBarGtk*>::iterator it = infobars_gtk_.begin();
        it != infobars_gtk_.end(); ++it) {
     gtk_widget_queue_draw((*it)->widget());
   }
@@ skipping 91 matching lines @@
   SkCanvas& canvas = *canvas_paint.sk_canvas();
 
   canvas.drawPath(path, paint);
 
   paint.setShader(NULL);
   paint.setColor(SkColorSetA(gfx::GdkColorToSkColor(source->GetBorderColor()),
                              SkColorGetA(grad_colors[0])));
   paint.setStyle(SkPaint::kStroke_Style);
   canvas.drawPath(path, paint);
 }