Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/gtk/infobars/confirm_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/confirm_infobar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/event_utils.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 
 
 // ConfirmInfoBarDelegate ------------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<ConfirmInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new ConfirmInfoBarGtk(delegate.Pass()));
+InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new ConfirmInfoBarGtk(owner, this);
 }
 
 
 // ConfirmInfoBarGtk -----------------------------------------------------------
 
-ConfirmInfoBarGtk::ConfirmInfoBarGtk(
-    scoped_ptr<ConfirmInfoBarDelegate> delegate)
-    : InfoBarGtk(delegate.PassAs<InfoBarDelegate>()),
+ConfirmInfoBarGtk::ConfirmInfoBarGtk(InfoBarService* owner,
+                                     ConfirmInfoBarDelegate* delegate)
+    : InfoBarGtk(owner, delegate),
       confirm_hbox_(NULL),
       size_group_(NULL) {
 }
 
 ConfirmInfoBarGtk::~ConfirmInfoBarGtk() {
   if (size_group_)
     g_object_unref(size_group_);
 }
 
-void ConfirmInfoBarGtk::PlatformSpecificSetOwner() {
-  InfoBarGtk::PlatformSpecificSetOwner();
+void ConfirmInfoBarGtk::InitWidgets() {
+  InfoBarGtk::InitWidgets();
 
   confirm_hbox_ = gtk_chrome_shrinkable_hbox_new(FALSE, FALSE,
                                                  kEndOfLabelSpacing);
   // This alignment allocates the confirm hbox only as much space as it
   // requests, and less if there is not enough available.
   GtkWidget* align = gtk_alignment_new(0, 0, 0, 1);
   gtk_container_add(GTK_CONTAINER(align), confirm_hbox_);
   gtk_box_pack_start(GTK_BOX(hbox()), align, TRUE, TRUE, 0);
 
   // We add the buttons in reverse order and pack end instead of start so
@@ skipping 54 matching lines @@
 void ConfirmInfoBarGtk::OnCancelButton(GtkWidget* widget) {
   if (delegate()->AsConfirmInfoBarDelegate()->Cancel())
     RemoveSelf();
 }
 
 void ConfirmInfoBarGtk::OnLinkClicked(GtkWidget* widget) {
   if (delegate()->AsConfirmInfoBarDelegate()->LinkClicked(
         event_utils::DispositionForCurrentButtonPressEvent()))
     RemoveSelf();
 }