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 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 const base::android::JavaParamRef<jstring>& jregion_code) { | 703 const base::android::JavaParamRef<jstring>& jregion_code) { |
704 address_normalizer_.LoadRulesForRegion( | 704 address_normalizer_.LoadRulesForRegion( |
705 ConvertJavaStringToUTF8(env, jregion_code)); | 705 ConvertJavaStringToUTF8(env, jregion_code)); |
706 } | 706 } |
707 | 707 |
708 void PersonalDataManagerAndroid::StartAddressNormalization( | 708 void PersonalDataManagerAndroid::StartAddressNormalization( |
709 JNIEnv* env, | 709 JNIEnv* env, |
710 const JavaParamRef<jobject>& unused_obj, | 710 const JavaParamRef<jobject>& unused_obj, |
711 const JavaParamRef<jstring>& jguid, | 711 const JavaParamRef<jstring>& jguid, |
712 const JavaParamRef<jstring>& jregion_code, | 712 const JavaParamRef<jstring>& jregion_code, |
| 713 jint jtimeout_seconds, |
713 const JavaParamRef<jobject>& jdelegate) { | 714 const JavaParamRef<jobject>& jdelegate) { |
714 const std::string region_code = ConvertJavaStringToUTF8(env, jregion_code); | 715 const std::string region_code = ConvertJavaStringToUTF8(env, jregion_code); |
715 const std::string guid = ConvertJavaStringToUTF8(env, jguid); | 716 const std::string guid = ConvertJavaStringToUTF8(env, jguid); |
716 | 717 |
717 // Get the profile to normalize. | 718 // Get the profile to normalize. |
718 AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(guid); | 719 AutofillProfile* profile = personal_data_manager_->GetProfileByGUID(guid); |
719 | 720 |
720 // Self-deleting object. | 721 // Self-deleting object. |
721 AndroidAddressNormalizerDelegate* requester = | 722 AndroidAddressNormalizerDelegate* requester = |
722 new AndroidAddressNormalizerDelegate(env, jdelegate); | 723 new AndroidAddressNormalizerDelegate(env, jdelegate); |
723 | 724 |
724 // Start the normalization. | 725 // Start the normalization. |
725 address_normalizer_.StartAddressNormalization(*profile, region_code, | 726 address_normalizer_.StartAddressNormalization(*profile, region_code, |
726 requester); | 727 jtimeout_seconds, requester); |
727 } | 728 } |
728 | 729 |
729 jboolean PersonalDataManagerAndroid::HasProfiles( | 730 jboolean PersonalDataManagerAndroid::HasProfiles( |
730 JNIEnv* env, | 731 JNIEnv* env, |
731 const base::android::JavaParamRef<jobject>& unused_obj) { | 732 const base::android::JavaParamRef<jobject>& unused_obj) { |
732 return !personal_data_manager_->GetProfiles().empty(); | 733 return !personal_data_manager_->GetProfiles().empty(); |
733 } | 734 } |
734 | 735 |
735 jboolean PersonalDataManagerAndroid::HasCreditCards( | 736 jboolean PersonalDataManagerAndroid::HasCreditCards( |
736 JNIEnv* env, | 737 JNIEnv* env, |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); | 874 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); |
874 } | 875 } |
875 | 876 |
876 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 877 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
877 PersonalDataManagerAndroid* personal_data_manager_android = | 878 PersonalDataManagerAndroid* personal_data_manager_android = |
878 new PersonalDataManagerAndroid(env, obj); | 879 new PersonalDataManagerAndroid(env, obj); |
879 return reinterpret_cast<intptr_t>(personal_data_manager_android); | 880 return reinterpret_cast<intptr_t>(personal_data_manager_android); |
880 } | 881 } |
881 | 882 |
882 } // namespace autofill | 883 } // namespace autofill |
OLD | NEW |