Create an autofill Suggestion class

android_webview/native/aw_autofill_client.cc

 // 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.
 
 #include "android_webview/native/aw_autofill_client.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_pref_store.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AwAutofillClient_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using content::WebContents;
@@ skipping 43 matching lines @@
 AwAutofillClient::GetDatabase() {
   android_webview::AwFormDatabaseService* service =
       static_cast<android_webview::AwBrowserContext*>(
           web_contents_->GetBrowserContext())->GetFormDatabaseService();
   return service->get_autofill_webdata_service();
 }
 
 void AwAutofillClient::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) {
-  values_ = values;
-  identifiers_ = identifiers;
+  suggestions_ = suggestions;
   delegate_ = delegate;
 
   // Convert element_bounds to be in screen space.
   gfx::Rect client_area = web_contents_->GetContainerBounds();
   gfx::RectF element_bounds_in_screen_space =
       element_bounds + client_area.OffsetFromOrigin();
 
   ShowAutofillPopupImpl(element_bounds_in_screen_space,
                         text_direction == base::i18n::RIGHT_TO_LEFT,
-                        values,
-                        labels,
-                        identifiers);
+                        suggestions);
 }
 
 void AwAutofillClient::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) {
+    const std::vector<autofill::Suggestion>& suggestions) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
 
   // We need an array of AutofillSuggestion.
-  size_t count = values.size();
+  size_t count = suggestions.size();
 
   ScopedJavaLocalRef<jobjectArray> data_array =
       Java_AwAutofillClient_createAutofillSuggestionArray(env, count);
 
   for (size_t i = 0; i < count; ++i) {
-    ScopedJavaLocalRef<jstring> name = ConvertUTF16ToJavaString(env, values[i]);
+    ScopedJavaLocalRef<jstring> name =
+        ConvertUTF16ToJavaString(env, suggestions[i].value);
     ScopedJavaLocalRef<jstring> label =
-        ConvertUTF16ToJavaString(env, labels[i]);
+        ConvertUTF16ToJavaString(env, suggestions[i].label);
     Java_AwAutofillClient_addToAutofillSuggestionArray(
-        env, data_array.obj(), i, name.obj(), label.obj(), identifiers[i]);
+        env, data_array.obj(), i, name.obj(), label.obj(),
+        suggestions[i].frontend_id);
   }
 
   Java_AwAutofillClient_showAutofillPopup(env,
                                           obj.obj(),
                                           element_bounds.x(),
                                           element_bounds.y(),
                                           element_bounds.width(),
                                           element_bounds.height(),
                                           is_rtl,
                                           data_array.obj());
@@ skipping 31 matching lines @@
     const base::string16& profile_full_name) {
 }
 
 void AwAutofillClient::OnFirstUserGestureObserved() {
   NOTIMPLEMENTED();
 }
 
 void AwAutofillClient::SuggestionSelected(JNIEnv* env,
                                           jobject object,
                                           jint position) {
-  if (delegate_)
-    delegate_->DidAcceptSuggestion(values_[position], identifiers_[position]);
+  if (delegate_) {
+    delegate_->DidAcceptSuggestion(suggestions_[position].value,
+                                   suggestions_[position].frontend_id);
+  }
 }
 
 void AwAutofillClient::HideRequestAutocompleteDialog() {
   NOTIMPLEMENTED();
 }
 
 void AwAutofillClient::ShowAutofillSettings() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 19 matching lines @@
     const GURL& source_url,
     const ResultCallback& callback) {
   NOTIMPLEMENTED();
 }
 
 bool RegisterAwAutofillClient(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview