Chromium Code Reviews| Index: chrome/browser/autofill/android/personal_data_manager_android.h |
| diff --git a/chrome/browser/autofill/android/personal_data_manager_android.h b/chrome/browser/autofill/android/personal_data_manager_android.h |
| index f64a313d1ade1e87cd1e4f06b8393b3071035a07..ff4afe626d2cf49fe2d9edfa70ded8024f396be5 100644 |
| --- a/chrome/browser/autofill/android/personal_data_manager_android.h |
| +++ b/chrome/browser/autofill/android/personal_data_manager_android.h |
| @@ -12,14 +12,25 @@ |
| #include "components/autofill/core/browser/personal_data_manager.h" |
| #include "components/autofill/core/browser/personal_data_manager_observer.h" |
| #include "components/payments/core/address_normalizer.h" |
| +#include "third_party/libaddressinput/chromium/chrome_address_validator.h" |
| namespace autofill { |
| // Android wrapper of the PersonalDataManager which provides access from the |
| // Java layer. Note that on Android, there's only a single profile, and |
| // therefore a single instance of this wrapper. |
| -class PersonalDataManagerAndroid : public PersonalDataManagerObserver { |
| +class PersonalDataManagerAndroid |
| + : public PersonalDataManagerObserver, |
| + public LoadRulesListener, |
| + public base::SupportsWeakPtr<PersonalDataManagerAndroid> { |
| public: |
| + // The interface for the sub-key request. |
| + class Delegate { |
| + public: |
| + virtual void OnRulesSuccessfullyLoaded() = 0; |
| + virtual ~Delegate() {} |
| + }; |
| + |
| PersonalDataManagerAndroid(JNIEnv* env, jobject obj); |
| // Returns true if personal data manager has loaded the initial data. |
| @@ -284,7 +295,14 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { |
| // Starts loading the address validation rules for the specified |
| // |region_code|. |
| - void LoadRulesForRegion( |
| + void LoadRulesForAddressNormalization( |
| + JNIEnv* env, |
| + const base::android::JavaParamRef<jobject>& unused_obj, |
| + const base::android::JavaParamRef<jstring>& region_code); |
| + |
| + // Starts loading the rules for the specified |region_code| for the further |
| + // sub-key request. |
| + void LoadRulesForSubKeys( |
| JNIEnv* env, |
| const base::android::JavaParamRef<jobject>& unused_obj, |
| const base::android::JavaParamRef<jstring>& region_code); |
| @@ -312,6 +330,31 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { |
| JNIEnv* env, |
| const base::android::JavaParamRef<jobject>& unused_obj); |
| + // Gets the sub-keys for the region with |jregion_code| code, if the |
| + // |jregion_code| rules have finished loading. Otherwise, sets up a task to |
| + // get the sub-keys, when the rules are loaded. |
| + void StartGettingRegionSubKeys( |
| + JNIEnv* env, |
| + const base::android::JavaParamRef<jobject>& unused_obj, |
| + const base::android::JavaParamRef<jstring>& jregion_code, |
| + const base::android::JavaParamRef<jobject>& jdelegate); |
| + |
| + // Gets the sub-keys of the rule associated with |jregion_code|. Should only |
| + // be called when the rules are loaded. |
| + base::android::ScopedJavaLocalRef<jobjectArray> GetSubKeys( |
| + JNIEnv* env, |
| + const std::string& jregion_code); |
| + |
| + // Callback of the sub-keys request. |
| + // This is called when the sub-keys are loaded. |
| + void OnAddressRulesLoaded(const std::string& region_code, |
| + bool success) override; |
| + |
| + // Cancels the pending sub-key request task. |
| + void CancelPendingGetSubKeys( |
| + JNIEnv* env, |
| + const base::android::JavaParamRef<jobject>& unused_obj); |
| + |
| private: |
| ~PersonalDataManagerAndroid() override; |
| @@ -359,9 +402,15 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { |
| // Pointer to the PersonalDataManager for the main profile. |
| PersonalDataManager* personal_data_manager_; |
| - // The address validator used to normalize addresses. |
| + // The address validator used for sub key request. |
|
sebsg
2017/03/21 15:29:52
I think this comment is for your new address_valid
Parastoo
2017/03/21 20:05:52
:P
Done.
|
| payments::AddressNormalizer address_normalizer_; |
| + AddressValidator address_validator_; |
| + |
| + // The region code and the request for the pending sub-key request. |
| + std::unique_ptr<Delegate> pending_subkey_request_; |
| + std::string pending_subkey_region_code_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid); |
| }; |