Update Confirmation UI for saved password change

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 78 matching lines @@
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       never_save_passwords_(false),
       display_disposition_(metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
   origin_ = controller->origin();
   state_ = controller->state();
-  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
+  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE ||
+      state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     pending_password_ = controller->PendingPassword();
     local_credentials_ = DeepCopyForms(controller->GetCurrentForms());
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     // We don't need anything.
   } 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) {
+  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE ||
+      state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     UpdatePendingStateTitle();
   } 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.
@@ skipping 117 matching lines @@
 
 void ManagePasswordsBubbleModel::OnSaveClicked() {
   dismissal_reason_ = metrics_util::CLICKED_SAVE;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->SavePassword();
   state_ = password_manager::ui::MANAGE_STATE;
 }
 
+void ManagePasswordsBubbleModel::OnUpdateClicked(
+    const autofill::PasswordForm& password_form) {
+  dismissal_reason_ = metrics_util::CLICKED_UPDATE;
+  RecordExperimentStatistics(web_contents(), dismissal_reason_);

[vasilii, 2015/07/27 15:44:49]

You should call this only for the "Save?" bubble.

[dvadym, 2015/07/30 11:22:44]

Removed

[vabr (Chromium), 2015/07/31 12:48:13]

So why don't we gather the statistics here?

[vasilii, 2015/07/31 14:38:53]

Because it's not a save bubble and it should not affect the smart bubble
algorithm.

+  ManagePasswordsUIController* manage_passwords_ui_controller =
+      ManagePasswordsUIController::FromWebContents(web_contents());
+  manage_passwords_ui_controller->UpdatePassword(password_form);
+  state_ = password_manager::ui::MANAGE_STATE;
+}
+
 void ManagePasswordsBubbleModel::OnDoneClicked() {
   dismissal_reason_ = metrics_util::CLICKED_DONE;
 }
 
 // TODO(gcasto): Is it worth having this be separate from OnDoneClicked()?
 // User intent is pretty similar in both cases.
 void ManagePasswordsBubbleModel::OnOKClicked() {
   dismissal_reason_ = metrics_util::CLICKED_OK;
 }
 
@@ skipping 56 matching lines @@
 
 Profile* ManagePasswordsBubbleModel::GetProfile() const {
   return GetProfileFromWebContents(web_contents());
 }
 
 bool ManagePasswordsBubbleModel::IsNewUIActive() const {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableCredentialManagerAPI);
 }
 
+bool ManagePasswordsBubbleModel::ShouldShowMultipleAccountUpdateUI() const {
+  return state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE &&
+         local_credentials_.size() > 1;
+}
+
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }
 
 void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {
   title_brand_link_range_ = gfx::Range();
   if (never_save_passwords_) {
     title_ = l10n_util::GetStringUTF16(
         IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);
   } else {
     GetSavePasswordDialogTitleTextAndLinkRange(
         web_contents()->GetVisibleURL(), origin(),
-        IsSmartLockBrandingEnabled(GetProfile()), &title_,
+        IsSmartLockBrandingEnabled(GetProfile()),
+        state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, &title_,
         &title_brand_link_range_);
   }
 }