Update Confirmation UI for saved password change

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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_ui_controller.h"
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
@@ skipping 187 matching lines @@
 #endif
 }
 
 void ManagePasswordsUIController::SavePassword() {
   DCHECK(PasswordPendingUserDecision());
   SavePasswordInternal();
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   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) {
   DCHECK_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, state());
   DCHECK(!passwords_data_.credentials_callback().is_null());
 
   // Here, |credential_type| refers to whether the credential was originally
   // passed into ::OnChooseCredentials as part of the |local_credentials| or
   // |federated_credentials| lists (e.g. whether it is an existing credential
   // saved for this origin, or whether we should synthesize a new
@@ skipping 23 matching lines @@
   password_manager::CredentialInfo info =
       password_manager::CredentialInfo(form, type_to_return);
   passwords_data_.credentials_callback().Run(info);
   passwords_data_.set_credentials_callback(
       ManagePasswordsState::CredentialsCallback());
 }
 
 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();
   passwords_data_.TransitionToState(password_manager::ui::BLACKLIST_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::NeverSavePasswordInternal() {
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   DCHECK(form_manager);
   form_manager->PermanentlyBlacklist();
@@ skipping 47 matching lines @@
 
 void ManagePasswordsUIController::WasHidden() {
 #if !defined(OS_ANDROID)
   TabDialogs::FromWebContents(web_contents())->HideManagePasswordsBubble();
 #endif
 }
 
 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);
   return form_manager->pending_credentials();
 }
 
 void ManagePasswordsUIController::UpdateIconAndBubbleState(
     ManagePasswordsIcon* icon) {
   if (should_pop_up_bubble_) {
     // We must display the icon before showing the bubble, as the bubble would
@@ skipping 29 matching lines @@
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 #endif
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }