Infobar system refactor.

chrome/browser/password_manager/password_manager_delegate_impl.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/password_manager/password_manager_delegate_impl.h"
 
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_metrics_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 13 matching lines @@
 
 // After a successful *new* login attempt, we take the PasswordFormManager in
 // provisional_save_manager_ and move it to a SavePasswordInfoBarDelegate while
 // the user makes up their mind with the "save password" infobar. Note if the
 // login is one we already know about, the end of the line is
 // provisional_save_manager_ because we just update it on success and so such
 // forms never end up in an infobar.
 class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // If we won't be showing the one-click signin infobar, creates a save
-  // password infobar delegate and adds it to the InfoBarService for
-  // |web_contents|. |uma_histogram_suffix| is empty, or one of the "group_X"
-  // suffixes used in the histogram names for infobar usage reporting; if empty,
-  // the usage is not reported, otherwise the suffix is used to choose the right
-  // histogram.
+  // password infobar and delegate and adds the infobar to the InfoBarService
+  // for |web_contents|.  |uma_histogram_suffix| is empty, or one of the
+  // "group_X" suffixes used in the histogram names for infobar usage reporting;
+  // if empty, the usage is not reported, otherwise the suffix is used to choose
+  // the right histogram.
   static void Create(content::WebContents* web_contents,
                      PasswordFormManager* form_to_save,
                      const std::string& uma_histogram_suffix);
 
  private:
   enum ResponseType {
     NO_RESPONSE = 0,
     REMEMBER_PASSWORD,
     NEVER_REMEMBER_PASSWORD,
     INFOBAR_DISMISSED,
     NUM_RESPONSE_TYPES,
   };
 
-  SavePasswordInfoBarDelegate(InfoBarService* infobar_service,
-                              PasswordFormManager* form_to_save,
+  SavePasswordInfoBarDelegate(PasswordFormManager* form_to_save,
                               const std::string& uma_histogram_suffix);
   virtual ~SavePasswordInfoBarDelegate();
 
   // ConfirmInfoBarDelegate
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
@@ skipping 31 matching lines @@
   // TODO(mathp): Checking only against associated_username() causes a bug
   // referenced here: crbug.com/133275
   if (((realm == GaiaUrls::GetInstance()->gaia_login_form_realm()) ||
        (realm == GURL("https://www.google.com/"))) &&
       OneClickSigninHelper::CanOffer(
           web_contents, OneClickSigninHelper::CAN_OFFER_FOR_INTERSTITAL_ONLY,
           UTF16ToUTF8(form_to_save->associated_username()), NULL))
     return;
 #endif
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  infobar_service->AddInfoBar(
-      scoped_ptr<InfoBarDelegate>(new SavePasswordInfoBarDelegate(
-          infobar_service, form_to_save, uma_histogram_suffix)));
+  InfoBarService::FromWebContents(web_contents)->AddInfoBar(
+      ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
+          new SavePasswordInfoBarDelegate(form_to_save,
+                                          uma_histogram_suffix))));
 }
 
 SavePasswordInfoBarDelegate::SavePasswordInfoBarDelegate(
-    InfoBarService* infobar_service,
     PasswordFormManager* form_to_save,
     const std::string& uma_histogram_suffix)
-    : ConfirmInfoBarDelegate(infobar_service),
+    : ConfirmInfoBarDelegate(),
       form_to_save_(form_to_save),
       infobar_response_(NO_RESPONSE),
       uma_histogram_suffix_(uma_histogram_suffix) {
   if (!uma_histogram_suffix_.empty()) {
     password_manager_metrics_util::LogUMAHistogramBoolean(
         "PasswordManager.SavePasswordPromptDisplayed_" + uma_histogram_suffix_,
         true);
   }
 }
 
@@ skipping 98 matching lines @@
 bool PasswordManagerDelegateImpl::DidLastPageLoadEncounterSSLErrors() {
   content::NavigationEntry* entry =
       web_contents_->GetController().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return false;
   }
 
   return net::IsCertStatusError(entry->GetSSL().cert_status);
 }