Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1492)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autofill/android/personal_data_manager_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/webapps/webapp_registry.cc ('k') | chrome/browser/media/android/cdm/media_drm_credential_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autofill/android/personal_data_manager_android.cc
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 6b70e25ce459e56fdf5945099dd45bbd96b481d5..156ead71007dc6def02a3e45f40db521b4fcfc69 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -62,30 +62,27 @@ ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
JNIEnv* env,
const AutofillProfile& profile) {
return Java_AutofillProfile_create(
- env, ConvertUTF8ToJavaString(env, profile.guid()).obj(),
- ConvertUTF8ToJavaString(env, profile.origin()).obj(),
+ env, ConvertUTF8ToJavaString(env, profile.guid()),
+ ConvertUTF8ToJavaString(env, profile.origin()),
profile.record_type() == AutofillProfile::LOCAL_PROFILE,
- ConvertUTF16ToJavaString(env, profile.GetInfo(
- AutofillType(NAME_FULL),
- g_browser_process->GetApplicationLocale())).obj(),
- ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)).obj(),
ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)).obj(),
- ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_STATE)).obj(),
- ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_CITY)).obj(),
- ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)).obj(),
- ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_ZIP)).obj(),
- ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)).obj(),
- ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(ADDRESS_HOME_COUNTRY)).obj(),
+ env, profile.GetInfo(AutofillType(NAME_FULL),
+ g_browser_process->GetApplicationLocale())),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)),
+ ConvertUTF16ToJavaString(env,
+ profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS)),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_STATE)),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_CITY)),
ConvertUTF16ToJavaString(
- env, profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)).obj(),
- ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)).obj(),
- ConvertUTF8ToJavaString(env, profile.language_code()).obj());
+ env, profile.GetRawInfo(ADDRESS_HOME_DEPENDENT_LOCALITY)),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_ZIP)),
+ ConvertUTF16ToJavaString(env,
+ profile.GetRawInfo(ADDRESS_HOME_SORTING_CODE)),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(ADDRESS_HOME_COUNTRY)),
+ ConvertUTF16ToJavaString(env,
+ profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER)),
+ ConvertUTF16ToJavaString(env, profile.GetRawInfo(EMAIL_ADDRESS)),
+ ConvertUTF8ToJavaString(env, profile.language_code()));
}
void MaybeSetRawInfo(AutofillProfile* profile,
@@ -100,41 +97,38 @@ void PopulateNativeProfileFromJava(
JNIEnv* env,
AutofillProfile* profile) {
profile->set_origin(
- ConvertJavaStringToUTF8(
- Java_AutofillProfile_getOrigin(env, jprofile.obj())));
- profile->SetInfo(AutofillType(NAME_FULL),
- ConvertJavaStringToUTF16(
- Java_AutofillProfile_getFullName(env, jprofile.obj())),
- g_browser_process->GetApplicationLocale());
+ ConvertJavaStringToUTF8(Java_AutofillProfile_getOrigin(env, jprofile)));
+ profile->SetInfo(
+ AutofillType(NAME_FULL),
+ ConvertJavaStringToUTF16(Java_AutofillProfile_getFullName(env, jprofile)),
+ g_browser_process->GetApplicationLocale());
MaybeSetRawInfo(profile, autofill::COMPANY_NAME,
- Java_AutofillProfile_getCompanyName(env, jprofile.obj()));
+ Java_AutofillProfile_getCompanyName(env, jprofile));
MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_STREET_ADDRESS,
- Java_AutofillProfile_getStreetAddress(env, jprofile.obj()));
+ Java_AutofillProfile_getStreetAddress(env, jprofile));
MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_STATE,
- Java_AutofillProfile_getRegion(env, jprofile.obj()));
+ Java_AutofillProfile_getRegion(env, jprofile));
MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_CITY,
- Java_AutofillProfile_getLocality(env, jprofile.obj()));
- MaybeSetRawInfo(
- profile, autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
- Java_AutofillProfile_getDependentLocality(env, jprofile.obj()));
+ Java_AutofillProfile_getLocality(env, jprofile));
+ MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
+ Java_AutofillProfile_getDependentLocality(env, jprofile));
MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_ZIP,
- Java_AutofillProfile_getPostalCode(env, jprofile.obj()));
+ Java_AutofillProfile_getPostalCode(env, jprofile));
MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_SORTING_CODE,
- Java_AutofillProfile_getSortingCode(env, jprofile.obj()));
+ Java_AutofillProfile_getSortingCode(env, jprofile));
ScopedJavaLocalRef<jstring> country_code =
- Java_AutofillProfile_getCountryCode(env, jprofile.obj());
+ Java_AutofillProfile_getCountryCode(env, jprofile);
if (!country_code.is_null()) {
profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
ConvertJavaStringToUTF16(country_code),
g_browser_process->GetApplicationLocale());
}
MaybeSetRawInfo(profile, autofill::PHONE_HOME_WHOLE_NUMBER,
- Java_AutofillProfile_getPhoneNumber(env, jprofile.obj()));
+ Java_AutofillProfile_getPhoneNumber(env, jprofile));
MaybeSetRawInfo(profile, autofill::EMAIL_ADDRESS,
- Java_AutofillProfile_getEmailAddress(env, jprofile.obj()));
- profile->set_language_code(
- ConvertJavaStringToUTF8(
- Java_AutofillProfile_getLanguageCode(env, jprofile.obj())));
+ Java_AutofillProfile_getEmailAddress(env, jprofile));
+ profile->set_language_code(ConvertJavaStringToUTF8(
+ Java_AutofillProfile_getLanguageCode(env, jprofile)));
}
// Mapping from Chrome card types to PaymentRequest basic card payment spec and
@@ -173,24 +167,21 @@ ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
const PaymentRequestData& payment_request_data =
GetPaymentRequestData(card.type());
return Java_CreditCard_create(
- env, ConvertUTF8ToJavaString(env, card.guid()).obj(),
- ConvertUTF8ToJavaString(env, card.origin()).obj(),
+ env, ConvertUTF8ToJavaString(env, card.guid()),
+ ConvertUTF8ToJavaString(env, card.origin()),
card.record_type() == CreditCard::LOCAL_CARD,
card.record_type() == CreditCard::FULL_SERVER_CARD,
- ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME_FULL))
- .obj(),
- ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
- ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()).obj(),
- ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
- .obj(),
+ ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME_FULL)),
+ ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)),
+ ConvertUTF16ToJavaString(env, card.TypeAndLastFourDigits()),
+ ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_EXP_MONTH)),
ConvertUTF16ToJavaString(env,
- card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR))
- .obj(),
- ConvertUTF8ToJavaString(env, payment_request_data.basic_card_payment_type)
- .obj(),
+ card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)),
+ ConvertUTF8ToJavaString(env,
+ payment_request_data.basic_card_payment_type),
ResourceMapper::MapFromChromiumId(payment_request_data.icon_resource_id),
- ConvertUTF8ToJavaString(env, card.billing_address_id()) .obj(),
- ConvertUTF8ToJavaString(env, card.server_id()) .obj());
+ ConvertUTF8ToJavaString(env, card.billing_address_id()),
+ ConvertUTF8ToJavaString(env, card.server_id()));
}
const char* GetCardTypeForBasicCardPaymentType(
@@ -294,15 +285,15 @@ class FullCardRequester : public payments::FullCardRequest::Delegate,
const base::string16& cvc) override {
JNIEnv* env = base::android::AttachCurrentThread();
Java_FullCardRequestDelegate_onFullCardDetails(
- env, jdelegate_.obj(), CreateJavaCreditCardFromNative(env, card).obj(),
- base::android::ConvertUTF16ToJavaString(env, cvc).obj());
+ env, jdelegate_, CreateJavaCreditCardFromNative(env, card),
+ base::android::ConvertUTF16ToJavaString(env, cvc));
delete this;
}
// payments::FullCardRequest::Delegate:
void OnFullCardError() override {
JNIEnv* env = base::android::AttachCurrentThread();
- Java_FullCardRequestDelegate_onFullCardError(env, jdelegate_.obj());
+ Java_FullCardRequestDelegate_onFullCardError(env, jdelegate_);
delete this;
}
@@ -542,8 +533,7 @@ void PersonalDataManagerAndroid::OnPersonalDataChanged() {
if (weak_java_obj_.get(env).is_null())
return;
- Java_PersonalDataManager_personalDataChanged(env,
- weak_java_obj_.get(env).obj());
+ Java_PersonalDataManager_personalDataChanged(env, weak_java_obj_.get(env));
}
// static
« no previous file with comments | « chrome/browser/android/webapps/webapp_registry.cc ('k') | chrome/browser/media/android/cdm/media_drm_credential_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698