Commit ed2b7441 authored by estade's avatar estade Committed by Commit bot

Only show local addresses in Android Autofill options page.

BUG=461537

Review URL: https://codereview.chromium.org/955443004

Cr-Commit-Position: refs/heads/master@{#318139}
parent 92f2f6d9
...@@ -190,7 +190,7 @@ PersonalDataManagerAndroid::~PersonalDataManagerAndroid() { ...@@ -190,7 +190,7 @@ PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
jint PersonalDataManagerAndroid::GetProfileCount(JNIEnv* unused_env, jint PersonalDataManagerAndroid::GetProfileCount(JNIEnv* unused_env,
jobject unused_obj) { jobject unused_obj) {
return personal_data_manager_->GetProfiles().size(); return personal_data_manager_->web_profiles().size();
} }
ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex( ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex(
...@@ -198,7 +198,7 @@ ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex( ...@@ -198,7 +198,7 @@ ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetProfileByIndex(
jobject unused_obj, jobject unused_obj,
jint index) { jint index) {
const std::vector<AutofillProfile*>& profiles = const std::vector<AutofillProfile*>& profiles =
personal_data_manager_->GetProfiles(); personal_data_manager_->web_profiles();
size_t index_size_t = static_cast<size_t>(index); size_t index_size_t = static_cast<size_t>(index);
DCHECK_LT(index_size_t, profiles.size()); DCHECK_LT(index_size_t, profiles.size());
return CreateJavaProfileFromNative(env, *profiles[index_size_t]); return CreateJavaProfileFromNative(env, *profiles[index_size_t]);
...@@ -237,6 +237,21 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetProfile( ...@@ -237,6 +237,21 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetProfile(
return ConvertUTF8ToJavaString(env, profile.guid()); return ConvertUTF8ToJavaString(env, profile.guid());
} }
ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
JNIEnv* env,
jobject unused_obj) {
std::vector<base::string16> labels;
AutofillProfile::CreateInferredLabels(
personal_data_manager_->web_profiles(),
NULL,
NAME_FULL,
2,
g_browser_process->GetApplicationLocale(),
&labels);
return base::android::ToJavaArrayOfStrings(env, labels);
}
jint PersonalDataManagerAndroid::GetCreditCardCount(JNIEnv* unused_env, jint PersonalDataManagerAndroid::GetCreditCardCount(JNIEnv* unused_env,
jobject unused_obj) { jobject unused_obj) {
return personal_data_manager_->GetLocalCreditCards().size(); return personal_data_manager_->GetLocalCreditCards().size();
...@@ -285,21 +300,6 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard( ...@@ -285,21 +300,6 @@ ScopedJavaLocalRef<jstring> PersonalDataManagerAndroid::SetCreditCard(
return ConvertUTF8ToJavaString(env, card.guid()); return ConvertUTF8ToJavaString(env, card.guid());
} }
ScopedJavaLocalRef<jobjectArray> PersonalDataManagerAndroid::GetProfileLabels(
JNIEnv* env,
jobject unused_obj) {
std::vector<base::string16> labels;
AutofillProfile::CreateInferredLabels(
personal_data_manager_->GetProfiles(),
NULL,
NAME_FULL,
2,
g_browser_process->GetApplicationLocale(),
&labels);
return base::android::ToJavaArrayOfStrings(env, labels);
}
void PersonalDataManagerAndroid::RemoveByGUID(JNIEnv* env, void PersonalDataManagerAndroid::RemoveByGUID(JNIEnv* env,
jobject unused_obj, jobject unused_obj,
jstring jguid) { jstring jguid) {
......
...@@ -19,7 +19,7 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { ...@@ -19,7 +19,7 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
public: public:
PersonalDataManagerAndroid(JNIEnv* env, jobject obj); PersonalDataManagerAndroid(JNIEnv* env, jobject obj);
// Regular Autofill Profiles // These functions act on "web profiles" aka "LOCAL_PROFILE" profiles.
// ------------------------- // -------------------------
// Returns the number of web and auxiliary profiles. // Returns the number of web and auxiliary profiles.
...@@ -47,7 +47,13 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { ...@@ -47,7 +47,13 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
jobject unused_obj, jobject unused_obj,
jobject jprofile); jobject jprofile);
// Credit Card Profiles // Gets the labels for all known profiles. These labels are useful for
// distinguishing the profiles from one another.
base::android::ScopedJavaLocalRef<jobjectArray> GetProfileLabels(
JNIEnv* env,
jobject unused_obj);
// These functions act on local credit cards.
// -------------------- // --------------------
// Returns the number of credit cards. // Returns the number of credit cards.
...@@ -75,12 +81,6 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver { ...@@ -75,12 +81,6 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
jobject unused_obj, jobject unused_obj,
jobject jcard); jobject jcard);
// Gets the labels for all known profiles. These labels are useful for
// distinguishing the profiles from one another.
base::android::ScopedJavaLocalRef<jobjectArray> GetProfileLabels(
JNIEnv* env,
jobject unused_obj);
// Removes the profile or credit card represented by |jguid|. // Removes the profile or credit card represented by |jguid|.
void RemoveByGUID(JNIEnv* env, jobject unused_obj, jstring jguid); void RemoveByGUID(JNIEnv* env, jobject unused_obj, jstring jguid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment