Password bubble: Keep the bubble in sync with the password store.

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 "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "chrome/common/url_constants.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::WebContents;
 using autofill::PasswordFormMap;
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents) {
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
 
-  password_submitted_ =
-      manage_passwords_bubble_ui_controller->password_submitted();
-  if (password_submitted_) {
-    if (manage_passwords_bubble_ui_controller->password_to_be_saved())
-      manage_passwords_bubble_state_ = PASSWORD_TO_BE_SAVED;
-    else
-      manage_passwords_bubble_state_ = MANAGE_PASSWORDS_AFTER_SAVING;
-  } else {
+  if (manage_passwords_bubble_ui_controller->password_to_be_saved())
+    manage_passwords_bubble_state_ = PASSWORD_TO_BE_SAVED;
+  else
     manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
-  }
 
   title_ = l10n_util::GetStringUTF16(
       (manage_passwords_bubble_state_ == PASSWORD_TO_BE_SAVED) ?
           IDS_SAVE_PASSWORD : IDS_MANAGE_PASSWORDS);
-  if (password_submitted_) {
-    pending_credentials_ =
-        manage_passwords_bubble_ui_controller->pending_credentials();
-  }
+  pending_credentials_ =
+      manage_passwords_bubble_ui_controller->pending_credentials();
   best_matches_ = manage_passwords_bubble_ui_controller->best_matches();
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
 }
 
 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {}
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
   manage_passwords_bubble_state_ = PASSWORD_TO_BE_SAVED;
 }
 
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
   manage_passwords_bubble_ui_controller->NeverSavePassword();
   manage_passwords_bubble_ui_controller->unset_password_to_be_saved();
   manage_passwords_bubble_state_ = NEVER_SAVE_PASSWORDS;
 }
 
 void ManagePasswordsBubbleModel::OnSaveClicked() {
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
   manage_passwords_bubble_ui_controller->SavePassword();
   manage_passwords_bubble_ui_controller->unset_password_to_be_saved();
-  manage_passwords_bubble_state_ = MANAGE_PASSWORDS_AFTER_SAVING;
+  manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
 }
 
 void ManagePasswordsBubbleModel::OnManageLinkClicked() {
   chrome::ShowSettingsSubPage(chrome::FindBrowserWithWebContents(web_contents_),
                               chrome::kPasswordManagerSubPage);
 }
 
 void ManagePasswordsBubbleModel::OnPasswordAction(
     const autofill::PasswordForm& password_form,
     PasswordAction action) {
   if (!web_contents_)
     return;
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS).get();
   DCHECK(password_store);
   if (action == REMOVE_PASSWORD)
     password_store->RemoveLogin(password_form);
   else
     password_store->AddLogin(password_form);
-  // This is necessary in case the bubble is instantiated again, we thus do not
-  // display the pending credentials if they were deleted.
-  if (password_form.username_value == pending_credentials_.username_value) {
-    ManagePasswordsBubbleUIController::FromWebContents(web_contents_)
-        ->set_password_submitted(action == ADD_PASSWORD);
-  }
-}
-
-void ManagePasswordsBubbleModel::DeleteFromBestMatches(
-    autofill::PasswordForm password_form) {
-  ManagePasswordsBubbleUIController::FromWebContents(web_contents_)->
-      RemoveFromBestMatches(password_form);
 }
 
 void ManagePasswordsBubbleModel::WebContentsDestroyed(
     content::WebContents* web_contents) {
   // The WebContents have been destroyed.
   web_contents_ = NULL;
 }