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 <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 JNIEnv* env, | 385 JNIEnv* env, |
386 const JavaParamRef<jobject>& unused_obj) { | 386 const JavaParamRef<jobject>& unused_obj) { |
387 return GetProfileLabels(env, false, false, | 387 return GetProfileLabels(env, false, false, |
388 personal_data_manager_->GetProfiles()); | 388 personal_data_manager_->GetProfiles()); |
389 } | 389 } |
390 | 390 |
391 ScopedJavaLocalRef<jobjectArray> | 391 ScopedJavaLocalRef<jobjectArray> |
392 PersonalDataManagerAndroid::GetProfileLabelsToSuggest( | 392 PersonalDataManagerAndroid::GetProfileLabelsToSuggest( |
393 JNIEnv* env, | 393 JNIEnv* env, |
394 const JavaParamRef<jobject>& unused_obj, | 394 const JavaParamRef<jobject>& unused_obj, |
395 jboolean include_name) { | 395 jboolean include_name_in_label) { |
396 return GetProfileLabels(env, true, include_name, | 396 return GetProfileLabels(env, true, include_name_in_label, |
397 personal_data_manager_->GetProfilesToSuggest()); | 397 personal_data_manager_->GetProfilesToSuggest()); |
398 } | 398 } |
399 | 399 |
400 base::android::ScopedJavaLocalRef<jstring> | 400 base::android::ScopedJavaLocalRef<jstring> |
401 PersonalDataManagerAndroid::GetAddressLabelForPaymentRequest( | 401 PersonalDataManagerAndroid::GetAddressLabelForPaymentRequest( |
402 JNIEnv* env, | 402 JNIEnv* env, |
403 const base::android::JavaParamRef<jobject>& unused_obj, | 403 const base::android::JavaParamRef<jobject>& unused_obj, |
404 const base::android::JavaParamRef<jobject>& jprofile) { | 404 const base::android::JavaParamRef<jobject>& jprofile) { |
405 std::vector<ServerFieldType> label_fields; | 405 std::vector<ServerFieldType> label_fields; |
406 label_fields.push_back(COMPANY_NAME); | 406 label_fields.push_back(COMPANY_NAME); |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 std::vector<base::string16> guids; | 745 std::vector<base::string16> guids; |
746 for (CreditCard* credit_card : credit_cards) | 746 for (CreditCard* credit_card : credit_cards) |
747 guids.push_back(base::UTF8ToUTF16(credit_card->guid())); | 747 guids.push_back(base::UTF8ToUTF16(credit_card->guid())); |
748 | 748 |
749 return base::android::ToJavaArrayOfStrings(env, guids); | 749 return base::android::ToJavaArrayOfStrings(env, guids); |
750 } | 750 } |
751 | 751 |
752 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels( | 752 ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels( |
753 JNIEnv* env, | 753 JNIEnv* env, |
754 bool address_only, | 754 bool address_only, |
755 bool include_name, | 755 bool include_name_in_label, |
756 std::vector<AutofillProfile*> profiles) { | 756 std::vector<AutofillProfile*> profiles) { |
757 std::unique_ptr<std::vector<ServerFieldType>> suggested_fields; | 757 std::unique_ptr<std::vector<ServerFieldType>> suggested_fields; |
758 size_t minimal_fields_shown = 2; | 758 size_t minimal_fields_shown = 2; |
759 if (address_only) { | 759 if (address_only) { |
760 suggested_fields.reset(new std::vector<ServerFieldType>); | 760 suggested_fields.reset(new std::vector<ServerFieldType>); |
761 if (include_name) | 761 if (include_name_in_label) |
762 suggested_fields->push_back(NAME_FULL); | 762 suggested_fields->push_back(NAME_FULL); |
763 suggested_fields->push_back(COMPANY_NAME); | 763 suggested_fields->push_back(COMPANY_NAME); |
764 suggested_fields->push_back(ADDRESS_HOME_LINE1); | 764 suggested_fields->push_back(ADDRESS_HOME_LINE1); |
765 suggested_fields->push_back(ADDRESS_HOME_LINE2); | 765 suggested_fields->push_back(ADDRESS_HOME_LINE2); |
766 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); | 766 suggested_fields->push_back(ADDRESS_HOME_DEPENDENT_LOCALITY); |
767 suggested_fields->push_back(ADDRESS_HOME_CITY); | 767 suggested_fields->push_back(ADDRESS_HOME_CITY); |
768 suggested_fields->push_back(ADDRESS_HOME_STATE); | 768 suggested_fields->push_back(ADDRESS_HOME_STATE); |
769 suggested_fields->push_back(ADDRESS_HOME_ZIP); | 769 suggested_fields->push_back(ADDRESS_HOME_ZIP); |
770 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); | 770 suggested_fields->push_back(ADDRESS_HOME_SORTING_CODE); |
771 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); | 771 suggested_fields->push_back(ADDRESS_HOME_COUNTRY); |
772 minimal_fields_shown = suggested_fields->size(); | 772 minimal_fields_shown = suggested_fields->size(); |
773 } | 773 } |
774 | 774 |
775 ServerFieldType excluded_field = include_name ? UNKNOWN_TYPE : NAME_FULL; | 775 ServerFieldType excluded_field = |
| 776 include_name_in_label ? UNKNOWN_TYPE : NAME_FULL; |
776 | 777 |
777 std::vector<base::string16> labels; | 778 std::vector<base::string16> labels; |
778 AutofillProfile::CreateInferredLabels( | 779 AutofillProfile::CreateInferredLabels( |
779 profiles, suggested_fields.get(), excluded_field, minimal_fields_shown, | 780 profiles, suggested_fields.get(), excluded_field, minimal_fields_shown, |
780 g_browser_process->GetApplicationLocale(), &labels); | 781 g_browser_process->GetApplicationLocale(), &labels); |
781 | 782 |
782 return base::android::ToJavaArrayOfStrings(env, labels); | 783 return base::android::ToJavaArrayOfStrings(env, labels); |
783 } | 784 } |
784 | 785 |
785 bool PersonalDataManagerAndroid::AreRulesLoadedForRegion( | 786 bool PersonalDataManagerAndroid::AreRulesLoadedForRegion( |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
831 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); | 832 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); |
832 } | 833 } |
833 | 834 |
834 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 835 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
835 PersonalDataManagerAndroid* personal_data_manager_android = | 836 PersonalDataManagerAndroid* personal_data_manager_android = |
836 new PersonalDataManagerAndroid(env, obj); | 837 new PersonalDataManagerAndroid(env, obj); |
837 return reinterpret_cast<intptr_t>(personal_data_manager_android); | 838 return reinterpret_cast<intptr_t>(personal_data_manager_android); |
838 } | 839 } |
839 | 840 |
840 } // namespace autofill | 841 } // namespace autofill |
OLD | NEW |