Infobar Componentization Proof of Concept

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"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 // SSLCertResultInfoBarDelegate -----------------------------------------------
 
 namespace {
 
-class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate {
+class SSLCertResultInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  public:
   // Creates an SSL cert result infobar and 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 base::string16& message,
                          net::X509Certificate* cert);
 
  private:
-  SSLCertResultInfoBarDelegate(const base::string16& message,
+  SSLCertResultInfoBarDelegate(content::WebContents* web_contents,
+                               const base::string16& message,
                                net::X509Certificate* cert);
   virtual ~SSLCertResultInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   base::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 base::string16& message,
                                               net::X509Certificate* cert) {
   scoped_ptr<InfoBar> infobar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new SSLCertResultInfoBarDelegate(message, cert))));
+      scoped_ptr<ConfirmInfoBarDelegate>(new SSLCertResultInfoBarDelegate(
+          infobar_service->web_contents(), message, cert))));
   return previous_infobar ?
       infobar_service->ReplaceInfoBar(previous_infobar, infobar.Pass()) :
       infobar_service->AddInfoBar(infobar.Pass());
 }
 
 SSLCertResultInfoBarDelegate::SSLCertResultInfoBarDelegate(
+    content::WebContents* web_contents,
     const base::string16& message,
     net::X509Certificate* cert)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       message_(message),
-      cert_(cert) {
-}
+      cert_(cert) {}
 
 SSLCertResultInfoBarDelegate::~SSLCertResultInfoBarDelegate() {
 }
 
 int SSLCertResultInfoBarDelegate::GetIconID() const {
   // TODO(davidben): use a more appropriate icon.
   return IDR_INFOBAR_SAVE_PASSWORD;
 }
 
 InfoBarDelegate::Type SSLCertResultInfoBarDelegate::GetInfoBarType() const {
@@ skipping 160 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();
 }