Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ssl/ssl_tab_helper.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/ssl/ssl_tab_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // SSLCertResultInfoBarDelegate -----------------------------------------------
 
 namespace {
 
 class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates an SSL cert result infobar and delegate.  If |previous_infobar| is
+  // Creates an SSL cert result infobar delegate.  If |previous_infobar| is
   // NULL, adds the infobar to |infobar_service|; otherwise, replaces
   // |previous_infobar|.  Returns the new infobar if it was successfully added.
   // |cert| is valid iff cert addition was successful.
-  static InfoBar* Create(InfoBarService* infobar_service,
-                         InfoBar* previous_infobar,
-                         const string16& message,
-                         net::X509Certificate* cert);
+  static InfoBarDelegate* Create(InfoBarService* infobar_service,
+                                 InfoBarDelegate* previous_infobar,
+                                 const string16& message,
+                                 net::X509Certificate* cert);
 
  private:
-  SSLCertResultInfoBarDelegate(const string16& message,
+  SSLCertResultInfoBarDelegate(InfoBarService* infobar_service,
+                               const string16& message,
                                net::X509Certificate* cert);
   virtual ~SSLCertResultInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   string16 message_;
   scoped_refptr<net::X509Certificate> cert_;  // The cert we added, if any.
 
   DISALLOW_COPY_AND_ASSIGN(SSLCertResultInfoBarDelegate);
 };
 
 // static
-InfoBar* SSLCertResultInfoBarDelegate::Create(InfoBarService* infobar_service,
-                                              InfoBar* previous_infobar,
-                                              const string16& message,
-                                              net::X509Certificate* cert) {
-  scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new SSLCertResultInfoBarDelegate(message, cert))));
+InfoBarDelegate* SSLCertResultInfoBarDelegate::Create(
+    InfoBarService* infobar_service,
+    InfoBarDelegate* previous_infobar,
+    const string16& message,
+    net::X509Certificate* cert) {
+  scoped_ptr<InfoBarDelegate> infobar(
+     new SSLCertResultInfoBarDelegate(infobar_service, message, cert));
   return previous_infobar ?
       infobar_service->ReplaceInfoBar(previous_infobar, infobar.Pass()) :
       infobar_service->AddInfoBar(infobar.Pass());
 }
 
 SSLCertResultInfoBarDelegate::SSLCertResultInfoBarDelegate(
+    InfoBarService* infobar_service,
     const string16& message,
     net::X509Certificate* cert)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       message_(message),
       cert_(cert) {
 }
 
 SSLCertResultInfoBarDelegate::~SSLCertResultInfoBarDelegate() {
 }
 
 int SSLCertResultInfoBarDelegate::GetIconID() const {
   // TODO(davidben): use a more appropriate icon.
   return IDR_INFOBAR_SAVE_PASSWORD;
@@ skipping 38 matching lines @@
   // Displays an infobar, replacing |infobar_| if it exists.
   void ShowInfoBar(const string16& message, net::X509Certificate* cert);
 
  private:
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   InfoBarService* infobar_service_;
-  InfoBar* infobar_;
+  InfoBarDelegate* infobar_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLAddCertData);
 };
 
 SSLTabHelper::SSLAddCertData::SSLAddCertData(InfoBarService* infobar_service)
     : infobar_service_(infobar_service),
       infobar_(NULL) {
   content::Source<InfoBarService> source(infobar_service_);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
@@ skipping 101 matching lines @@
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get()) {
     ptr_ref.reset(
         new SSLAddCertData(InfoBarService::FromWebContents(web_contents_)));
   }
   return ptr_ref.get();
 }