Update Confirmation UI for saved password change

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

Index: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
index e0c01979508610973ef1bae92417cd44bfca0a4d..53fed22cd9363a4ad61f1867296669a44c214cfe 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -205,6 +205,15 @@ void ManagePasswordsUIController::SavePassword() {
   UpdateBubbleAndIconVisibility();
 }
 
+void ManagePasswordsUIController::UpdatePassword(
+    const autofill::PasswordForm& password_form) {
+  DCHECK(PasswordPendingUserDecision() ||

[vabr (Chromium), 2015/07/24 08:24:28]

Cant this method be called when state() ==
password_manager::ui::PENDING_PASSWORD_STATE?

[dvadym, 2015/07/24 16:42:39]

Thanks, no, it can't, it was left from the previous implementation without
|PENDING_PASSWORD_UPDATE_STAT|. I've removed checking for pending_state

+         state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE);
+  UpdatePasswordInternal(password_form);
+  passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
+  UpdateBubbleAndIconVisibility();
+}
+
 void ManagePasswordsUIController::ChooseCredential(
     const autofill::PasswordForm& form,
     password_manager::CredentialType credential_type) {
@@ -248,10 +257,16 @@ void ManagePasswordsUIController::ChooseCredential(
 void ManagePasswordsUIController::SavePasswordInternal() {
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
-  DCHECK(form_manager);
   form_manager->Save();
 }
 
+void ManagePasswordsUIController::UpdatePasswordInternal(
+    const autofill::PasswordForm& password_form) {
+  password_manager::PasswordFormManager* form_manager =
+      passwords_data_.form_manager();
+  form_manager->Update(password_form);
+}
+
 void ManagePasswordsUIController::NeverSavePassword() {
   DCHECK(PasswordPendingUserDecision());

[vabr (Chromium), 2015/07/24 08:24:28]

Here it can also happen that state() ==
password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, can't it?

[dvadym, 2015/07/24 16:42:39]

No it can't, I haven't added "Never for this site" button in the current update
bubble. It doesn't have big sense to have such button:
1.Never can have two meaning: "Never save" and "Never update", and it may be
confusing for the user. We can specify in text which meaning we means. But
2. Both of them not so useful for the user
  a."Never save" - but the user already has stored account and moreover it will
not prevent showing update button next time
  b."Never update" - it's also not very useful, why the user don't want to
update password in the PasswordManager if he changed it. 
 

   NeverSavePasswordInternal();
@@ -321,7 +336,9 @@ void ManagePasswordsUIController::WasHidden() {
 const autofill::PasswordForm& ManagePasswordsUIController::
     PendingPassword() const {
   DCHECK(state() == password_manager::ui::PENDING_PASSWORD_STATE ||
-         state() == password_manager::ui::CONFIRMATION_STATE) << state();
+         state() == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE ||
+         state() == password_manager::ui::CONFIRMATION_STATE)
+      << state();
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   DCHECK(form_manager);