Fill on account select in the password manager

components/password_manager/core/browser/password_autofill_manager.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 "components/password_manager/core/browser/password_autofill_manager.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace password_manager {
 
 namespace {
 
 // This function attempts to fill |suggestions| and |realms| form |fill_data|
 // based on |current_username|. Unless |show_all| is true, it only picks
 // suggestions where the username has |current_username| as a prefix.
 void GetSuggestions(const autofill::PasswordFormFillData& fill_data,
                     const base::string16& current_username,
@@ skipping 70 matching lines @@
 
 void PasswordAutofillManager::OnAddPasswordFormMapping(
     int key,
     const autofill::PasswordFormFillData& fill_data) {
   if (!autofill::IsValidPasswordFormFillData(fill_data))
     return;
 
   login_to_password_info_[key] = fill_data;
 }
 
-void PasswordAutofillManager::OnShowPasswordSuggestions(
+void PasswordAutofillManager::ShowPasswordSuggestions(

[Garrett Casto, 2014/11/23 07:49:48]

Nit: I would just keep this as one function for now. The split doesn't make to
code any clearer to me.

[jww, 2014/11/25 02:46:26]

Done.

     int key,
     base::i18n::TextDirection text_direction,
     const base::string16& typed_username,
+    const base::string16& title,
     bool show_all,
     const gfx::RectF& bounds) {
   std::vector<base::string16> suggestions;
   std::vector<base::string16> realms;
   LoginToPasswordInfoMap::const_iterator fill_data_it =
       login_to_password_info_.find(key);
   if (fill_data_it == login_to_password_info_.end()) {
     // Probably a compromised renderer.
     NOTREACHED();
     return;
   }
   GetSuggestions(fill_data_it->second, typed_username, &suggestions, &realms,
                  show_all);
   DCHECK_EQ(suggestions.size(), realms.size());
 
   form_data_key_ = key;
 
   if (suggestions.empty()) {
     autofill_client_->HideAutofillPopup();
     return;
   }
 
   std::vector<base::string16> empty(suggestions.size());
   std::vector<int> password_ids(suggestions.size(),
                                 autofill::POPUP_ITEM_ID_PASSWORD_ENTRY);
+  if (!title.empty()) {
+    suggestions.insert(suggestions.begin(), title);
+    realms.insert(realms.begin(), base::string16());
+    empty.insert(empty.begin(), base::string16());
+    password_ids.insert(password_ids.begin(), autofill::POPUP_ITEM_ID_TITLE);
+  }
   autofill_client_->ShowAutofillPopup(bounds,
                                       text_direction,
                                       suggestions,
                                       realms,
                                       empty,
                                       password_ids,
                                       weak_ptr_factory_.GetWeakPtr());
 }
 
+void PasswordAutofillManager::OnShowPasswordSuggestions(
+    int key,
+    base::i18n::TextDirection text_direction,
+    const base::string16& typed_username,
+    int options,
+    const gfx::RectF& bounds) {
+  bool show_all =
+      (options & autofill::ShowPasswordSuggestionsOptions::SHOW_ALL);
+  bool is_password_field =
+      (options & autofill::ShowPasswordSuggestionsOptions::IS_PASSWORD_FIELD);
+  base::string16 title;
+  if (is_password_field) {
+    title = l10n_util::GetStringUTF16(
+        IDS_AUTOFILL_PASSWORD_FIELD_SUGGESTIONS_TITLE);
+  }
+  ShowPasswordSuggestions(key, text_direction, typed_username, title, show_all,
+                          bounds);
+}
+
 void PasswordAutofillManager::Reset() {
   login_to_password_info_.clear();
 }
 
 bool PasswordAutofillManager::FillSuggestionForTest(
     int key,
     const base::string16& username) {
   return FillSuggestion(key, username);
 }
 
@@ skipping 81 matching lines @@
     autofill::PasswordFormFillData* found_password) {
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(key);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_password = iter->second;
   return true;
 }
 
 }  //  namespace password_manager