Fill on account select in the password manager

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/ui/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 100 matching lines @@
       base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
                  base::Unretained(this)));
 #if !defined(OS_ANDROID)
   subtext_font_list_ = name_font_list_.DeriveWithSizeDelta(kLabelFontSizeDelta);
 #if defined(OS_MACOSX)
   // There is no italic version of the system font.
   warning_font_list_ = name_font_list_;
 #else
   warning_font_list_ = name_font_list_.DeriveWithStyle(gfx::Font::ITALIC);
 #endif
+  title_font_list_ = name_font_list_.DeriveWithStyle(gfx::Font::BOLD);
 #endif
 }
 
 AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {}
 
 void AutofillPopupControllerImpl::Show(
     const std::vector<base::string16>& names,
     const std::vector<base::string16>& subtexts,
     const std::vector<base::string16>& icons,
-    const std::vector<int>& identifiers) {
-  SetValues(names, subtexts, icons, identifiers);
+    const std::vector<int>& identifiers,
+    const base::string16& title) {

[Garrett Casto, 2014/11/04 23:35:30]

Given the way that this works for other labels, it seems like |title| shouldn't
be a part of this function and instead PasswordAutofillManager should explicitly
add the correct values to the other vectors if it wants to add a title.

[jww, 2014/11/06 21:28:56]

Done.

+  SetValues(names, subtexts, icons, identifiers, title);
 
 #if !defined(OS_ANDROID)
   // Android displays the long text with ellipsis using the view attributes.
 
   UpdatePopupBounds();
   int popup_width = popup_bounds().width();
 
   // Elide the name and subtext strings so that the popup fits in the available
   // space.
   for (size_t i = 0; i < names_.size(); ++i) {
@@ skipping 111 matching lines @@
 bool AutofillPopupControllerImpl::HandleKeyPressEvent(
     const content::NativeWebKeyboardEvent& event) {
   switch (event.windowsKeyCode) {
     case ui::VKEY_UP:
       SelectPreviousLine();
       return true;
     case ui::VKEY_DOWN:
       SelectNextLine();
       return true;
     case ui::VKEY_PRIOR:  // Page up.
-      SetSelectedLine(0);
+      SetSelectedLine(GetFirstSelectableLine());
       return true;
     case ui::VKEY_NEXT:  // Page down.
       SetSelectedLine(names().size() - 1);
       return true;
     case ui::VKEY_ESCAPE:
       Hide();
       return true;
     case ui::VKEY_DELETE:
       return (event.modifiers & content::NativeWebKeyboardEvent::ShiftKey) &&
              RemoveSelectedLine();
@@ skipping 124 matching lines @@
 const std::vector<int>& AutofillPopupControllerImpl::identifiers() const {
   return identifiers_;
 }
 
 #if !defined(OS_ANDROID)
 const gfx::FontList& AutofillPopupControllerImpl::GetNameFontListForRow(
     size_t index) const {
   if (identifiers_[index] == POPUP_ITEM_ID_WARNING_MESSAGE)
     return warning_font_list_;
 
+  if (identifiers_[index] == POPUP_ITEM_ID_TITLE)
+    return title_font_list_;
+
   return name_font_list_;
 }
 
 const gfx::FontList& AutofillPopupControllerImpl::subtext_font_list() const {
   return subtext_font_list_;
 }
 #endif
 
 int AutofillPopupControllerImpl::selected_line() const {
   return selected_line_;
 }
 
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
+  if (selected_line != kNoSelection && identifiers_.size() > 0 &&
+      identifiers_[selected_line] == POPUP_ITEM_ID_TITLE)
+    return;
+
   if (selected_line_ != kNoSelection &&
       static_cast<size_t>(selected_line_) < identifiers_.size())
     InvalidateRow(selected_line_);
 
   if (selected_line != kNoSelection)
     InvalidateRow(selected_line);
 
   selected_line_ = selected_line;
 
   if (selected_line_ != kNoSelection) {
@@ skipping 81 matching lines @@
 }
 
 int AutofillPopupControllerImpl::GetRowHeightFromId(int identifier) const {
   if (identifier == POPUP_ITEM_ID_SEPARATOR)
     return kSeparatorHeight;
 
   return kRowHeight;
 }
 
 bool AutofillPopupControllerImpl::CanAccept(int id) {
-  return id != POPUP_ITEM_ID_SEPARATOR && id != POPUP_ITEM_ID_WARNING_MESSAGE;
+  return id != POPUP_ITEM_ID_SEPARATOR && id != POPUP_ITEM_ID_WARNING_MESSAGE &&
+         id != POPUP_ITEM_ID_TITLE;
 }
 
 bool AutofillPopupControllerImpl::HasSuggestions() {
   return identifiers_.size() != 0 &&
          (identifiers_[0] > 0 ||
           identifiers_[0] == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY ||
           identifiers_[0] == POPUP_ITEM_ID_PASSWORD_ENTRY ||
           identifiers_[0] == POPUP_ITEM_ID_DATALIST_ENTRY ||
           identifiers_[0] == POPUP_ITEM_ID_MAC_ACCESS_CONTACTS);
 }
 
 void AutofillPopupControllerImpl::SetValues(
     const std::vector<base::string16>& names,
     const std::vector<base::string16>& subtexts,
     const std::vector<base::string16>& icons,
-    const std::vector<int>& identifiers) {
+    const std::vector<int>& identifiers,
+    const base::string16& title) {
   names_ = names;
   full_names_ = names;
   subtexts_ = subtexts;
   icons_ = icons;
   identifiers_ = identifiers;
+
+  if (!title.empty()) {
+    names_.insert(names_.begin(), title);
+    full_names_.insert(full_names_.begin(), title);
+    subtexts_.insert(subtexts_.begin(), base::string16());
+    icons_.insert(icons_.begin(), base::string16());
+    identifiers_.insert(identifiers_.begin(), POPUP_ITEM_ID_TITLE);
+  }
 }
 
 void AutofillPopupControllerImpl::ShowView() {
   view_->Show();
 }
 
 void AutofillPopupControllerImpl::InvalidateRow(size_t row) {
   DCHECK(0 <= row);
   DCHECK(row < identifiers_.size());
   view_->InvalidateRow(row);
@@ skipping 68 matching lines @@
 
   names_.clear();
   subtexts_.clear();
   icons_.clear();
   identifiers_.clear();
   full_names_.clear();
 
   selected_line_ = kNoSelection;
 }
 
+int AutofillPopupControllerImpl::GetFirstSelectableLine() {
+  if (identifiers().size() < 1 || identifiers()[0] != POPUP_ITEM_ID_TITLE)
+    return 0;
+
+  return 1;
+}
+
 }  // namespace autofill