Allow deleting autofill password suggestions on Shift+Delete

chrome/browser/password_manager/password_form_manager.cc

 // Copyright (c) 2012 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/password_manager/password_form_manager.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_split.h"
@@ skipping 17 matching lines @@
 
 PasswordFormManager::PasswordFormManager(Profile* profile,
                                          PasswordManager* password_manager,
                                          content::WebContents* web_contents,
                                          const PasswordForm& observed_form,
                                          bool ssl_valid)
     : best_matches_deleter_(&best_matches_),
       observed_form_(observed_form),
       is_new_login_(true),
       has_generated_password_(false),
+      remover_(false),
       password_manager_(password_manager),
       preferred_match_(NULL),
       state_(PRE_MATCHING_PHASE),
       profile_(profile),
       web_contents_(web_contents),
       manager_action_(kManagerActionNone),
       user_action_(kUserActionNone),
       submit_result_(kSubmitResultNotSubmitted) {
   DCHECK(profile_);
   if (observed_form_.origin.is_valid())
@@ skipping 54 matching lines @@
                          form.origin.spec().end(),
                          after_scheme2,
                          observed_form_.origin.spec().end())
                          != form.origin.spec().end();
     }
     return false;
   }
   return true;
 }
 
+void PasswordFormManager::RemoveAndUpdate(const string16& username_to_remove) {

[vabr (Chromium), 2014/03/07 23:43:36]

This is duplicated code: RemoveAndUpdate and Update should be one function, with
an argument specifying the future value of |only_update_|.

[riadh.chtara, 2014/03/14 17:16:08]

Done.

+  remover_ = true;
+  only_update_ = false;
+  username_to_remove_ = username_to_remove;
+
+  state_ = PRE_MATCHING_PHASE;
+  FetchMatchingLoginsFromPasswordStore();
+}
+
+void PasswordFormManager::Update(const string16& username_to_remove) {
+  remover_ = true;
+  only_update_ = true;
+  username_to_remove_ = username_to_remove;
+
+  state_ = PRE_MATCHING_PHASE;
+  FetchMatchingLoginsFromPasswordStore();
+}
+
 bool PasswordFormManager::IsBlacklisted() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
   if (preferred_match_ && preferred_match_->blacklisted_by_user)
     return true;
   return false;
 }
 
 void PasswordFormManager::PermanentlyBlacklist() {
   DCHECK_EQ(state_, POST_MATCHING_PHASE);
 
@@ skipping 134 matching lines @@
 
 void PasswordFormManager::FetchMatchingLoginsFromPasswordStore() {
   DCHECK_EQ(state_, PRE_MATCHING_PHASE);
   state_ = MATCHING_PHASE;
   PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS).get();
   if (!password_store) {
     NOTREACHED();
     return;
   }
-  password_store->GetLogins(observed_form_, this);
+  PasswordForm f = observed_form_;

[vabr (Chromium), 2014/03/07 23:43:36]

Could you please explain to me why do we need to delete the username for
GetLogins?

[riadh.chtara, 2014/03/14 18:06:18]

I thought that using GetLogins with a PasswordForm where the username_value is
not null will return only the login with the same username.
But I tried to remove the additional lines I wrote, and every thing was fine.
So I was wrong and in my latest patch, this problem was fixed.

+  f.username_value = string16();
+  password_store->GetLogins(f, this);
 }
 
 bool PasswordFormManager::HasCompletedMatching() {
   return state_ == POST_MATCHING_PHASE;
 }
 
 void PasswordFormManager::OnRequestDone(
     const std::vector<PasswordForm*>& logins_result) {
   // Note that the result gets deleted after this call completes, but we own
   // the PasswordForm objects pointed to by the result vector, thus we keep
@@ skipping 98 matching lines @@
   // or (3) if it matched using public suffix domain matching.
   bool wait_for_username =
       profile_->IsOffTheRecord() ||
       observed_form_.action.GetWithEmptyPath() !=
           preferred_match_->action.GetWithEmptyPath() ||
           preferred_match_->IsPublicSuffixMatch();
   if (wait_for_username)
     manager_action_ = kManagerActionNone;
   else
     manager_action_ = kManagerActionAutofilled;
-  password_manager_->Autofill(observed_form_, best_matches_,
-                              *preferred_match_, wait_for_username);
+
+  if (!remover_) {
+    password_manager_->Autofill(
+        observed_form_, best_matches_, *preferred_match_, wait_for_username);
+  } else {
+    remover_ = false;
+    PasswordStore* password_store = PasswordStoreFactory::GetForProfile(
+        profile_, Profile::EXPLICIT_ACCESS).get();
+    if (!password_store) {
+      NOTREACHED();
+      return;
+    }
+
+    PasswordFormMap::iterator it = best_matches_.find(username_to_remove_);
+
+    if (it != best_matches_.end()) {
+      if (!only_update_)
+        password_store->RemoveLogin(*(it->second));
+
+      best_matches_.erase(it);
+      if (best_matches_.size() > 0) {
+        preferred_match_ = best_matches_.begin()->second;
+        password_manager_->Autofill(observed_form_,
+                                    best_matches_,
+                                    *preferred_match_,
+                                    wait_for_username);
+      }
+
+    }
+
+  }
 }
 
 void PasswordFormManager::OnPasswordStoreRequestDone(
       CancelableRequestProvider::Handle handle,
       const std::vector<autofill::PasswordForm*>& result) {
   // TODO(kaiwang): Remove this function.
   NOTREACHED();
 }
 
 void PasswordFormManager::OnGetPasswordStoreResults(
@@ skipping 253 matching lines @@
 
 void PasswordFormManager::SubmitFailed() {
   submit_result_ = kSubmitResultFailed;
 }
 
 void PasswordFormManager::SendNotBlacklistedToRenderer() {
   content::RenderViewHost* host = web_contents_->GetRenderViewHost();
   host->Send(new AutofillMsg_FormNotBlacklisted(host->GetRoutingID(),
                                                  observed_form_));
 }