Autofill: Refactoring to support fetching password after a username is selected

components/autofill/core/browser/autofill_external_delegate.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/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     AutofillManager* manager,
     AutofillDriver* driver)
     : manager_(manager),
       driver_(driver),
-      password_manager_(driver),
       query_id_(0),
       display_warning_if_disabled_(false),
       has_suggestion_(false),
       has_shown_popup_for_current_edit_(false),
       weak_ptr_factory_(this) {
   DCHECK(manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
@@ skipping 71 matching lines @@
         element_bounds_,
         query_field_.text_direction,
         values,
         labels,
         icons,
         ids,
         GetWeakPtr());
   }
 }
 
-void AutofillExternalDelegate::OnShowPasswordSuggestions(
-    const std::vector<base::string16>& suggestions,
-    const std::vector<base::string16>& realms,
-    const FormFieldData& field,
-    const gfx::RectF& element_bounds) {
-  query_field_ = field;
-  element_bounds_ = element_bounds;
-
-  if (suggestions.empty()) {
-    manager_->delegate()->HideAutofillPopup();
-    return;
-  }
-
-  std::vector<base::string16> empty(suggestions.size());
-  std::vector<int> password_ids(suggestions.size(),
-                                POPUP_ITEM_ID_PASSWORD_ENTRY);
-  manager_->delegate()->ShowAutofillPopup(
-      element_bounds_,
-      query_field_.text_direction,
-      suggestions,
-      realms,
-      empty,
-      password_ids,
-      GetWeakPtr());
-}
-
 void AutofillExternalDelegate::SetCurrentDataListValues(
     const std::vector<base::string16>& data_list_values,
     const std::vector<base::string16>& data_list_labels) {
   data_list_values_ = data_list_values;
   data_list_labels_ = data_list_labels;
 
   manager_->delegate()->UpdateAutofillPopupDataListValues(
       data_list_values,
       data_list_labels);
 }
@@ skipping 21 matching lines @@
 }
 
 void AutofillExternalDelegate::DidAcceptSuggestion(const base::string16& value,
                                                    int identifier) {
   if (identifier == POPUP_ITEM_ID_AUTOFILL_OPTIONS) {
     // User selected 'Autofill Options'.
     manager_->ShowAutofillSettings();
   } else if (identifier == POPUP_ITEM_ID_CLEAR_FORM) {
     // User selected 'Clear form'.
     driver_->RendererShouldClearFilledForm();
   } else if (identifier == POPUP_ITEM_ID_PASSWORD_ENTRY) {

[Garrett Casto, 2014/03/14 08:25:22]

Seems like eventually this should be removed, but I'm fine leaving it for extra
verification for now.

-    bool success = password_manager_.DidAcceptAutofillSuggestion(
-        query_field_, value);
-    DCHECK(success);
+    NOTREACHED();  // Should be handled elsewhere.
   } else if (identifier == POPUP_ITEM_ID_DATALIST_ENTRY) {
     driver_->RendererShouldAcceptDataListSuggestion(value);
   } else if (identifier == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
     // User selected an Autocomplete, so we fill directly.
     driver_->RendererShouldSetNodeText(value);
   } else {
     FillAutofillFormData(identifier, false);
   }
 
   manager_->delegate()->HideAutofillPopup();
@@ skipping 12 matching lines @@
 
   has_shown_popup_for_current_edit_ = false;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
   driver_->RendererShouldClearPreviewedForm();
 }
 
 void AutofillExternalDelegate::Reset() {
   manager_->delegate()->HideAutofillPopup();
-
-  password_manager_.Reset();
-}
-
-void AutofillExternalDelegate::AddPasswordFormMapping(
-      const FormFieldData& username_field,
-      const PasswordFormFillData& fill_data) {
-  password_manager_.AddPasswordFormMapping(username_field, fill_data);
 }
 
 base::WeakPtr<AutofillExternalDelegate> AutofillExternalDelegate::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
   // If the selected element is a warning we don't want to do anything.
   if (unique_id == POPUP_ITEM_ID_WARNING_MESSAGE)
@@ skipping 105 matching lines @@
   // Set the values that all datalist elements share.
   icons->insert(icons->begin(),
                 data_list_values_.size(),
                 base::string16());
   unique_ids->insert(unique_ids->begin(),
                      data_list_values_.size(),
                      POPUP_ITEM_ID_DATALIST_ENTRY);
 }
 
 }  // namespace autofill