OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/autofill/android/personal_data_manager_android.h" | 5 #include "chrome/browser/autofill/android/personal_data_manager_android.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "base/format_macros.h" | 8 #include "base/format_macros.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 11 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "components/autofill/browser/autofill_country.h" | |
Ilya Sherman
2013/04/05 07:18:41
nit: No longer needed.
jam
2013/04/05 07:35:35
Done.
| |
14 #include "components/autofill/browser/field_types.h" | 15 #include "components/autofill/browser/field_types.h" |
15 #include "components/autofill/browser/personal_data_manager.h" | 16 #include "components/autofill/browser/personal_data_manager.h" |
16 #include "jni/PersonalDataManager_jni.h" | 17 #include "jni/PersonalDataManager_jni.h" |
17 | 18 |
18 using base::android::ConvertJavaStringToUTF8; | 19 using base::android::ConvertJavaStringToUTF8; |
19 using base::android::ConvertUTF16ToJavaString; | 20 using base::android::ConvertUTF16ToJavaString; |
20 using base::android::ConvertUTF8ToJavaString; | 21 using base::android::ConvertUTF8ToJavaString; |
21 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
22 | 23 |
23 namespace { | 24 namespace { |
(...skipping 20 matching lines...) Expand all Loading... | |
44 env, | 45 env, |
45 profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(), | 46 profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(), |
46 ConvertUTF16ToJavaString( | 47 ConvertUTF16ToJavaString( |
47 env, | 48 env, |
48 profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(), | 49 profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(), |
49 ConvertUTF16ToJavaString( | 50 ConvertUTF16ToJavaString( |
50 env, | 51 env, |
51 profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(), | 52 profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(), |
52 ConvertUTF16ToJavaString( | 53 ConvertUTF16ToJavaString( |
53 env, | 54 env, |
54 profile.GetRawInfo(ADDRESS_HOME_COUNTRY)).obj(), | 55 profile.GetInfo(ADDRESS_HOME_COUNTRY, |
56 g_browser_process->GetApplicationLocale())).obj(), | |
55 ConvertUTF16ToJavaString( | 57 ConvertUTF16ToJavaString( |
56 env, | 58 env, |
57 profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(), | 59 profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(), |
58 ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj()); | 60 ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj()); |
59 } | 61 } |
60 | 62 |
61 void PopulateNativeProfileFromJava( | 63 void PopulateNativeProfileFromJava( |
62 const jobject& jprofile, | 64 const jobject& jprofile, |
63 JNIEnv* env, | 65 JNIEnv* env, |
64 AutofillProfile* profile) { | 66 AutofillProfile* profile) { |
(...skipping 18 matching lines...) Expand all Loading... | |
83 ConvertJavaStringToUTF16( | 85 ConvertJavaStringToUTF16( |
84 Java_AutofillProfile_getCity(env, jprofile))); | 86 Java_AutofillProfile_getCity(env, jprofile))); |
85 profile->SetRawInfo( | 87 profile->SetRawInfo( |
86 ADDRESS_HOME_STATE, | 88 ADDRESS_HOME_STATE, |
87 ConvertJavaStringToUTF16( | 89 ConvertJavaStringToUTF16( |
88 Java_AutofillProfile_getState(env, jprofile))); | 90 Java_AutofillProfile_getState(env, jprofile))); |
89 profile->SetRawInfo( | 91 profile->SetRawInfo( |
90 ADDRESS_HOME_ZIP, | 92 ADDRESS_HOME_ZIP, |
91 ConvertJavaStringToUTF16( | 93 ConvertJavaStringToUTF16( |
92 Java_AutofillProfile_getZip(env, jprofile))); | 94 Java_AutofillProfile_getZip(env, jprofile))); |
93 profile->SetRawInfo( | 95 profile->SetInfo( |
94 ADDRESS_HOME_COUNTRY, | 96 ADDRESS_HOME_COUNTRY, |
95 ConvertJavaStringToUTF16( | 97 ConvertJavaStringToUTF16( |
96 Java_AutofillProfile_getCountry(env, jprofile))); | 98 Java_AutofillProfile_getCountry(env, jprofile)), |
99 g_browser_process->GetApplicationLocale()); | |
Ilya Sherman
2013/04/05 07:18:41
nit: Looks like this line should be indented four
jam
2013/04/05 07:35:35
Done.
| |
97 profile->SetRawInfo( | 100 profile->SetRawInfo( |
98 PHONE_HOME_WHOLE_NUMBER, | 101 PHONE_HOME_WHOLE_NUMBER, |
99 ConvertJavaStringToUTF16( | 102 ConvertJavaStringToUTF16( |
100 Java_AutofillProfile_getPhoneNumber(env, jprofile))); | 103 Java_AutofillProfile_getPhoneNumber(env, jprofile))); |
101 profile->SetRawInfo( | 104 profile->SetRawInfo( |
102 EMAIL_ADDRESS, | 105 EMAIL_ADDRESS, |
103 ConvertJavaStringToUTF16( | 106 ConvertJavaStringToUTF16( |
104 Java_AutofillProfile_getEmailAddress(env, jprofile))); | 107 Java_AutofillProfile_getEmailAddress(env, jprofile))); |
105 } | 108 } |
106 | 109 |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
270 // static | 273 // static |
271 bool PersonalDataManagerAndroid::Register(JNIEnv* env) { | 274 bool PersonalDataManagerAndroid::Register(JNIEnv* env) { |
272 return RegisterNativesImpl(env); | 275 return RegisterNativesImpl(env); |
273 } | 276 } |
274 | 277 |
275 static jint Init(JNIEnv* env, jobject obj) { | 278 static jint Init(JNIEnv* env, jobject obj) { |
276 PersonalDataManagerAndroid* personal_data_manager_android = | 279 PersonalDataManagerAndroid* personal_data_manager_android = |
277 new PersonalDataManagerAndroid(env, obj); | 280 new PersonalDataManagerAndroid(env, obj); |
278 return reinterpret_cast<jint>(personal_data_manager_android); | 281 return reinterpret_cast<jint>(personal_data_manager_android); |
279 } | 282 } |
OLD | NEW |