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

Unified Diff: ui/base/l10n/l10n_util_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 | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/resource/resource_bundle_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/l10n/l10n_util_android.cc
diff --git a/ui/base/l10n/l10n_util_android.cc b/ui/base/l10n/l10n_util_android.cc
index e78ebbdc6382860cd7ce78571f1a460e87364820..5c7c12d57b17de60cdc502d98b5a16781c22cbf3 100644
--- a/ui/base/l10n/l10n_util_android.cc
+++ b/ui/base/l10n/l10n_util_android.cc
@@ -74,10 +74,10 @@ ScopedJavaLocalRef<jobject> NewJavaLocale(
locale, uloc_getCountry, ULOC_COUNTRY_CAPACITY);
std::string variant = GetLocaleComponent(
locale, uloc_getVariant, ULOC_FULLNAME_CAPACITY);
- return Java_LocalizationUtils_getJavaLocale(env,
- base::android::ConvertUTF8ToJavaString(env, language).obj(),
- base::android::ConvertUTF8ToJavaString(env, country).obj(),
- base::android::ConvertUTF8ToJavaString(env, variant).obj());
+ return Java_LocalizationUtils_getJavaLocale(
+ env, base::android::ConvertUTF8ToJavaString(env, language),
+ base::android::ConvertUTF8ToJavaString(env, country),
+ base::android::ConvertUTF8ToJavaString(env, variant));
}
} // namespace
@@ -91,10 +91,8 @@ base::string16 GetDisplayNameForLocale(const std::string& locale,
NewJavaLocale(env, display_locale);
ScopedJavaLocalRef<jstring> java_result(
- Java_LocalizationUtils_getDisplayNameForLocale(
- env,
- java_locale.obj(),
- java_display_locale.obj()));
+ Java_LocalizationUtils_getDisplayNameForLocale(env, java_locale,
+ java_display_locale));
return ConvertJavaStringToUTF16(java_result);
}
« no previous file with comments | « ui/base/clipboard/clipboard_android.cc ('k') | ui/base/resource/resource_bundle_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698