Create an autofill Suggestion class

android_webview/native/aw_autofill_client.h

 // Copyright 2014 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 ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_
 #define ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 55 matching lines @@
       const base::Closure& save_card_callback) override;
   virtual bool HasCreditCardScanFeature() override;
   virtual void ScanCreditCard(const CreditCardScanCallback& callback) override;
   virtual void ShowRequestAutocompleteDialog(
       const autofill::FormData& form,
       const GURL& source_url,
       const ResultCallback& callback) override;
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
-      const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels,
-      const std::vector<base::string16>& icons,
-      const std::vector<int>& identifiers,
+      const std::vector<autofill::Suggestion>& suggestions,
       base::WeakPtr<autofill::AutofillPopupDelegate> delegate) override;
   virtual void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
       const std::vector<base::string16>& labels) override;
   virtual void HideAutofillPopup() override;
   virtual bool IsAutocompleteEnabled() override;
   virtual void DetectAccountCreationForms(
       content::RenderFrameHost* rfh,
       const std::vector<autofill::FormStructure*>& forms) override;
   virtual void DidFillOrPreviewField(
       const base::string16& autofilled_value,
       const base::string16& profile_full_name) override;
   virtual void OnFirstUserGestureObserved() override;
 
   void SuggestionSelected(JNIEnv* env, jobject obj, jint position);
 
  private:
   AwAutofillClient(content::WebContents* web_contents);
   friend class content::WebContentsUserData<AwAutofillClient>;
 
-  void ShowAutofillPopupImpl(const gfx::RectF& element_bounds,
-                             bool is_rtl,
-                             const std::vector<base::string16>& values,
-                             const std::vector<base::string16>& labels,
-                             const std::vector<int>& identifiers);
+  void ShowAutofillPopupImpl(
+      const gfx::RectF& element_bounds,
+      bool is_rtl,
+      const std::vector<autofill::Suggestion>& suggestions);
 
   // The web_contents associated with this delegate.
   content::WebContents* web_contents_;
   bool save_form_data_;
   JavaObjectWeakGlobalRef java_ref_;
 
   // The current Autofill query values.
-  std::vector<base::string16> values_;
-  std::vector<int> identifiers_;
+  std::vector<autofill::Suggestion> suggestions_;
   base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AwAutofillClient);
 };
 
 bool RegisterAwAutofillClient(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_AW_AUTOFILL_CLIENT_H_