Create an autofill Suggestion class

components/autofill/core/browser/autofill_external_delegate.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "ui/gfx/rect.h"
 
 namespace autofill {
 
 class AutofillDriver;
 class AutofillManager;
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
@@ skipping 29 matching lines @@
   virtual void OnQuery(int query_id,
                        const FormData& form,
                        const FormFieldData& field,
                        const gfx::RectF& element_bounds,
                        bool display_warning_if_disabled);
 
   // Records query results and correctly formats them before sending them off
   // to be displayed.  Called when an Autofill query result is available.
   virtual void OnSuggestionsReturned(
       int query_id,
-      const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels,
-      const std::vector<base::string16>& icons,
-      const std::vector<int>& unique_ids);
+      const std::vector<Suggestion>& suggestions);
 
   // Set the data list value associated with the current field.
   void SetCurrentDataListValues(
       const std::vector<base::string16>& data_list_values,
       const std::vector<base::string16>& data_list_labels);
 
   // Inform the delegate that the text field editing has ended. This is
   // used to help record the metrics of when a new popup is shown.
   void DidEndTextFieldEditing();
 
@@ skipping 16 matching lines @@
                            int expiration_month,
                            int expiration_year);
 
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
   // Handle applying any Autofill warnings to the Autofill popup.
-  void ApplyAutofillWarnings(std::vector<base::string16>* values,
-                             std::vector<base::string16>* labels,
-                             std::vector<base::string16>* icons,
-                             std::vector<int>* unique_ids);
+  void ApplyAutofillWarnings(std::vector<Suggestion>* suggestions);
 
   // Handle applying any Autofill option listings to the Autofill popup.
   // This function should only get called when there is at least one
   // multi-field suggestion in the list of suggestions.
-  void ApplyAutofillOptions(std::vector<base::string16>* values,
-                            std::vector<base::string16>* labels,
-                            std::vector<base::string16>* icons,
-                            std::vector<int>* unique_ids);
+  void ApplyAutofillOptions(std::vector<Suggestion>* suggestions);
 
   // Insert the data list values at the start of the given list, including
   // any required separators.
-  void InsertDataListValues(std::vector<base::string16>* values,
-                            std::vector<base::string16>* labels,
-                            std::vector<base::string16>* icons,
-                            std::vector<int>* unique_ids);
+  void InsertDataListValues(std::vector<Suggestion>* suggestions);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // Pings the renderer.
   void PingRenderer();
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
   AutofillManager* manager_;  // weak.
 
   // Provides driver-level context to the shared code of the component. Must
   // outlive this object.
@@ skipping 32 matching lines @@
   std::vector<base::string16> data_list_labels_;
 
   base::WeakPtrFactory<AutofillExternalDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_