Create an autofill Suggestion class

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 450 matching lines @@
   bool SuggestionTextForSection(DialogSection section,
                                 base::string16* vertically_compact,
                                 base::string16* horizontally_compact);
   base::string16 RequiredActionTextForSection(DialogSection section) const;
   gfx::Image SuggestionIconForSection(DialogSection section);
   base::string16 ExtraSuggestionTextForSection(DialogSection section) const;
   gfx::Image ExtraSuggestionIconForSection(DialogSection section);
 
   // Suggests address completions using the downloaded i18n validation rules.
   // Stores the suggestions in |i18n_validator_suggestions_|.
-  void GetI18nValidatorSuggestions(DialogSection section,
-                                   ServerFieldType type,
-                                   std::vector<base::string16>* popup_values,
-                                   std::vector<base::string16>* popup_labels,
-                                   std::vector<base::string16>* popup_icons);
+  void GetI18nValidatorSuggestions(
+      DialogSection section,
+      ServerFieldType type,
+      std::vector<autofill::Suggestion>* popup_suggestions);
 
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
 
   // Returns a pointer to the language code that should be used for formatting
   // the address in |section| for display. Returns NULL for a non-address
   // |section|.
   std::string* MutableAddressLanguageCodeForSection(DialogSection section);
 
   // Returns the language code that should be used for formatting the address in
@@ skipping 250 matching lines @@
 
   // Whether |form_structure_| has asked for any details that would indicate
   // we should show a shipping section.
   bool cares_about_shipping_;
 
   // Site-provided transaction amount and currency. No attempt to validate this
   // input; it's passed directly to Wallet.
   base::string16 transaction_amount_;
   base::string16 transaction_currency_;
 
-  // The GUIDs for the currently showing unverified profiles popup.
-  std::vector<PersonalDataManager::GUIDPair> popup_guids_;
+  // The IDs for the currently showing unverified profiles popup. This will
+  // be the first section in the list. The rest of the items will be the
+  // i18n_validator_suggestions_.
+  std::vector<autofill::SuggestionBackendID> popup_suggestion_ids_;
 
   // The autofill suggestions based on downloaded i18n validation rules.
   std::vector< ::i18n::addressinput::AddressData> i18n_validator_suggestions_;
 
   // The controller for the currently showing popup (which helps users when
   // they're manually filling the dialog).
   base::WeakPtr<AutofillPopupControllerImpl> popup_controller_;
 
   // The type of the visible Autofill popup input (or UNKNOWN_TYPE if none).
   ServerFieldType popup_input_type_;
@@ skipping 87 matching lines @@
   base::string16 submitted_cardholder_name_;
 
   base::WeakPtrFactory<AutofillDialogControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_