Create an autofill Suggestion class

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 2107 matching lines @@
     return;
   }
 
   // If the user clicks while the popup is already showing, be sure to hide
   // it.
   if (!was_edit && popup_controller_.get()) {
     HidePopup();
     return;
   }
 
-  std::vector<base::string16> popup_values, popup_labels, popup_icons;
+  std::vector<autofill::Suggestion> popup_suggestions;
+  popup_suggestion_ids_.clear();
   if (common::IsCreditCardType(type)) {
-    GetManager()->GetCreditCardSuggestions(AutofillType(type),
-                                           field_contents,
-                                           &popup_values,
-                                           &popup_labels,
-                                           &popup_icons,
-                                           &popup_guids_);
+    popup_suggestions = GetManager()->GetCreditCardSuggestions(
+        AutofillType(type), field_contents);
+    for (const auto& suggestion : popup_suggestions)
+      popup_suggestion_ids_.push_back(suggestion.backend_id);
   } else {
-    GetManager()->GetProfileSuggestions(
+    popup_suggestions = GetManager()->GetProfileSuggestions(
         AutofillType(type),
         field_contents,
         false,
         RequestedTypesForSection(section),
         base::Bind(&AutofillDialogControllerImpl::ShouldSuggestProfile,
-                   base::Unretained(this), section),
-        &popup_values,
-        &popup_labels,
-        &popup_icons,
-        &popup_guids_);
+                   base::Unretained(this), section));
+    for (const auto& suggestion : popup_suggestions)
+      popup_suggestion_ids_.push_back(suggestion.backend_id);
 
-    GetI18nValidatorSuggestions(section, type, &popup_values, &popup_labels,
-                                &popup_icons);
+    // This will append to the popup_suggestions but not the IDs since there
+    // are no backend IDs for the I18N validator suggestions.
+    GetI18nValidatorSuggestions(section, type, &popup_suggestions);
   }
 
-  if (popup_values.empty()) {
+  if (popup_suggestions.empty()) {
     HidePopup();
     return;
   }
 
   // |popup_input_type_| must be set before calling |Show()|.
   popup_input_type_ = type;
   popup_section_ = section;
 
+  // Use our own 0-based IDs for the items.
   // TODO(estade): do we need separators and control rows like 'Clear
   // Form'?
-  std::vector<int> popup_ids;
-  for (size_t i = 0; i < popup_values.size(); ++i) {
-    popup_ids.push_back(i);
+  for (size_t i = 0; i < popup_suggestions.size(); ++i) {
+    popup_suggestions[i].frontend_id = i;
   }
 
   popup_controller_ = AutofillPopupControllerImpl::GetOrCreate(
       popup_controller_,
       weak_ptr_factory_.GetWeakPtr(),
       NULL,
       parent_view,
       content_bounds,
       base::i18n::IsRTL() ?
           base::i18n::RIGHT_TO_LEFT : base::i18n::LEFT_TO_RIGHT);
-  popup_controller_->Show(popup_values,
-                          popup_labels,
-                          popup_icons,
-                          popup_ids);
+  popup_controller_->Show(popup_suggestions);
 }
 
 void AutofillDialogControllerImpl::FocusMoved() {
   HidePopup();
 }
 
 bool AutofillDialogControllerImpl::ShouldShowErrorBubble() const {
   return popup_input_type_ == UNKNOWN_TYPE;
 }
 
@@ skipping 212 matching lines @@
     const base::string16& value,
     int identifier) {
   DCHECK_NE(UNKNOWN_TYPE, popup_input_type_);
   // Because |HidePopup()| can be called from |UpdateSection()|, remember the
   // type of the input for later here.
   const ServerFieldType popup_input_type = popup_input_type_;
 
   ScopedViewUpdates updates(view_.get());
   scoped_ptr<DataModelWrapper> wrapper;
 
-  if (static_cast<size_t>(identifier) < popup_guids_.size()) {
-    const PersonalDataManager::GUIDPair& pair = popup_guids_[identifier];
+  if (static_cast<size_t>(identifier) < popup_suggestion_ids_.size()) {
+    const SuggestionBackendID& sid = popup_suggestion_ids_[identifier];
     if (common::IsCreditCardType(popup_input_type)) {
       wrapper.reset(new AutofillCreditCardWrapper(
-          GetManager()->GetCreditCardByGUID(pair.first)));
+          GetManager()->GetCreditCardByGUID(sid.guid)));
     } else {
       wrapper.reset(new AutofillProfileWrapper(
-          GetManager()->GetProfileByGUID(pair.first),
+          GetManager()->GetProfileByGUID(sid.guid),
           AutofillType(popup_input_type),
-          pair.second));
+          sid.variant));
     }
   } else {
     wrapper.reset(new I18nAddressDataWrapper(
-        &i18n_validator_suggestions_[identifier - popup_guids_.size()]));
+        &i18n_validator_suggestions_[
+            identifier - popup_suggestion_ids_.size()]));
   }
 
   // If the user hasn't switched away from the default country and |wrapper|'s
   // country differs from the |view_|'s, rebuild inputs and restore user data.
   const FieldValueMap snapshot = TakeUserInputSnapshot();
   bool billing_rebuilt = false, shipping_rebuilt = false;
 
   base::string16 billing_country =
       wrapper->GetInfo(AutofillType(ADDRESS_BILLING_COUNTRY));
   if (popup_section_ == ActiveBillingSection() &&
@@ skipping 941 matching lines @@
 
   if (section == SECTION_SHIPPING)
     return shipping_country_combobox_model_.get();
 
   return NULL;
 }
 
 void AutofillDialogControllerImpl::GetI18nValidatorSuggestions(
     DialogSection section,
     ServerFieldType type,
-    std::vector<base::string16>* popup_values,
-    std::vector<base::string16>* popup_labels,
-    std::vector<base::string16>* popup_icons) {
+    std::vector<autofill::Suggestion>* popup_suggestions) {
   AddressField focused_field;
   if (!i18n::FieldForType(type, &focused_field))
     return;
 
   FieldValueMap inputs;
   view_->GetUserInput(section, &inputs);
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(inputs, &profile);
 
   scoped_ptr<AddressData> user_input =
       i18n::CreateAddressDataFromAutofillProfile(
           profile, g_browser_process->GetApplicationLocale());
   user_input->language_code = AddressLanguageCodeForSection(section);
 
   static const size_t kSuggestionsLimit = 10;
   AddressValidator::Status status = GetValidator()->GetSuggestions(
       *user_input, focused_field, kSuggestionsLimit,
       &i18n_validator_suggestions_);
 
   if (status != AddressValidator::SUCCESS)
     return;
 
   for (size_t i = 0; i < i18n_validator_suggestions_.size(); ++i) {
-    popup_values->push_back(base::UTF8ToUTF16(
-        i18n_validator_suggestions_[i].GetFieldValue(focused_field)));
+    popup_suggestions->push_back(autofill::Suggestion(
+        base::UTF8ToUTF16(
+            i18n_validator_suggestions_[i].GetFieldValue(focused_field))));
 
     // Disambiguate the suggestion by showing the smallest administrative
     // region of the suggested address:
     //    ADMIN_AREA > LOCALITY > DEPENDENT_LOCALITY
-    popup_labels->push_back(base::string16());
     for (int field = DEPENDENT_LOCALITY; field >= ADMIN_AREA; --field) {
       const std::string& field_value =
           i18n_validator_suggestions_[i].GetFieldValue(
               static_cast<AddressField>(field));
       if (focused_field != field && !field_value.empty()) {
-        popup_labels->back().assign(base::UTF8ToUTF16(field_value));
+        popup_suggestions->back().label = base::UTF8ToUTF16(field_value);
         break;
       }
     }
   }
-  popup_icons->resize(popup_values->size());
 }
 
 DetailInputs* AutofillDialogControllerImpl::MutableRequestedFieldsForSection(
     DialogSection section) {
   return const_cast<DetailInputs*>(&RequestedFieldsForSection(section));
 }
 
 std::string* AutofillDialogControllerImpl::MutableAddressLanguageCodeForSection(
     DialogSection section) {
   switch (section) {
@@ skipping 704 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill