New "Save password" bubble for the Credential Manager API.

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

 // Copyright 2013 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/passwords/manage_passwords_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 39 matching lines @@
 }
 
 void RecordExperimentStatistics(content::WebContents* web_contents,
                                 metrics_util::UIDismissalReason reason) {
   Profile* profile = GetProfileFromWebContents(web_contents);
   if (!profile)
     return;
   password_bubble_experiment::RecordBubbleClosed(profile->GetPrefs(), reason);
 }
 
-base::string16 PendingStateTitleBasedOnSavePasswordPref(
-    bool never_save_passwords) {
-  return l10n_util::GetStringUTF16(
-      never_save_passwords ? IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE
-                           : IDS_SAVE_PASSWORD);
-}
-
 ScopedVector<const autofill::PasswordForm> DeepCopyForms(
     const std::vector<const autofill::PasswordForm*>& forms) {
   ScopedVector<const autofill::PasswordForm> result;
   result.reserve(forms.size());
   std::transform(forms.begin(), forms.end(), std::back_inserter(result),
                  [](const autofill::PasswordForm* form) {
     return new autofill::PasswordForm(*form);
   });
   return result.Pass();
 }
@@ skipping 19 matching lines @@
   } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
     local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
     federated_credentials_ = DeepCopyForms(controller->GetFederatedForms());
   } else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE) {
     pending_password_ = *controller->GetCurrentForms()[0];
   } else {
     local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
   }
 
   if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
-    title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
+    title_ = PendingStateTitleBasedOnSavePasswordPref();
   } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_BLACKLISTED_TITLE);
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
   } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CHOOSE_TITLE);
   } else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE) {
     // There is no title.
   } else {
@@ skipping 73 matching lines @@
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NOPE;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   if (state_ != password_manager::ui::CREDENTIAL_REQUEST_STATE)
     state_ = password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnConfirmationForNeverForThisSite() {
   never_save_passwords_ = true;
-  title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
+  title_ = PendingStateTitleBasedOnSavePasswordPref();
 }
 
 void ManagePasswordsBubbleModel::OnUndoNeverForThisSite() {
   never_save_passwords_ = false;
-  title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
+  title_ = PendingStateTitleBasedOnSavePasswordPref();
 }
 
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NEVER;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->NeverSavePassword();
   state_ = password_manager::ui::BLACKLIST_STATE;
 }
@@ skipping 83 matching lines @@
 
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }
+
+base::string16
+ManagePasswordsBubbleModel::PendingStateTitleBasedOnSavePasswordPref() const {
+  int message_id = 0;
+  if (never_save_passwords_)
+    message_id = IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE;
+  else if (IsNewUIActive())
+    message_id = IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SMART_LOCK_PROMPT;
+  else
+    message_id = IDS_SAVE_PASSWORD;
+  return l10n_util::GetStringUTF16(message_id);
+}