Turn Autofill country text input into a Spinner.

chrome/browser/autofill/android/personal_data_manager_android.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/autofill/android/personal_data_manager_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/format_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
@@ skipping 24 matching lines @@
 ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
     JNIEnv* env,
     const AutofillProfile& profile) {
   return Java_AutofillProfile_create(
       env,
       ConvertUTF8ToJavaString(env, profile.guid()).obj(),
       ConvertUTF8ToJavaString(env, profile.origin()).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(NAME_FULL)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)).obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_STATE))
+          .obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_CITY))
+          .obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
       ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
-                          g_browser_process->GetApplicationLocale())).obj(),
-      ConvertUTF16ToJavaString(
-          env,
-          profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(),
+          env, profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)).obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
+          .obj(),
+      ConvertUTF16ToJavaString(env, profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER))
+          .obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj(),
       ConvertUTF8ToJavaString(env, profile.language_code()).obj());
 }
 
 void PopulateNativeProfileFromJava(
     const jobject& jprofile,
     JNIEnv* env,
     AutofillProfile* profile) {
   profile->set_origin(
       ConvertJavaStringToUTF8(
@@ skipping 31 matching lines @@
   profile->SetInfo(
       AutofillType(ADDRESS_HOME_ZIP),
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getPostalCode(env, jprofile)),
       g_browser_process->GetApplicationLocale());
   profile->SetInfo(
       AutofillType(ADDRESS_HOME_SORTING_CODE),
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getSortingCode(env, jprofile)),
       g_browser_process->GetApplicationLocale());
-  profile->SetInfo(
-      AutofillType(ADDRESS_HOME_COUNTRY),
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getCountry(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
+  profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
+                   ConvertJavaStringToUTF16(
+                       Java_AutofillProfile_getCountryCode(env, jprofile)),
+                   g_browser_process->GetApplicationLocale());
   profile->SetInfo(
       AutofillType(PHONE_HOME_WHOLE_NUMBER),
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getPhoneNumber(env, jprofile)),
       g_browser_process->GetApplicationLocale());
   profile->SetInfo(
       AutofillType(EMAIL_ADDRESS),
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getEmailAddress(env, jprofile)),
       g_browser_process->GetApplicationLocale());
@@ skipping 33 matching lines @@
       CREDIT_CARD_NUMBER,
       ConvertJavaStringToUTF16(Java_CreditCard_getNumber(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_EXP_MONTH,
       ConvertJavaStringToUTF16(Java_CreditCard_getMonth(env, jcard)));
   card->SetRawInfo(
       CREDIT_CARD_EXP_4_DIGIT_YEAR,
       ConvertJavaStringToUTF16(Java_CreditCard_getYear(env, jcard)));
 }
 
+/*
+ScopedJavaLocalRef<jobject> CreateJavaCountryFromNative(

[aurimas (slooooooooow), 2014/08/01 15:18:21]

Can you remove this?

[Evan Stade, 2014/08/01 18:59:23]

oops. Yes.

[Evan Stade, 2014/08/04 20:36:04]

Done.

+    JNIEnv* env,
+    const
+*/
+
 }  // namespace
 
 PersonalDataManagerAndroid::PersonalDataManagerAndroid(JNIEnv* env,
                                                        jobject obj)
     : weak_java_obj_(env, obj),
       personal_data_manager_(PersonalDataManagerFactory::GetForProfile(
           ProfileManager::GetActiveUserProfile())) {
   personal_data_manager_->AddObserver(this);
 }
 
@@ skipping 143 matching lines @@
           g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill