| Index: ui/base/resource/resource_bundle_android.cc
|
| diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
|
| index bcf306b0ad9fa6be4172b077713fd1adda5224dd..a1a4d00a41580ff7de82c72c5865dd27a91440cd 100644
|
| --- a/ui/base/resource/resource_bundle_android.cc
|
| +++ b/ui/base/resource/resource_bundle_android.cc
|
| @@ -90,12 +90,15 @@ int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) {
|
| return g_chrome_100_percent_fd;
|
| }
|
|
|
| -bool AssetContainedInApk(const std::string& filename) {
|
| +std::string GetPathForAndroidLocalePakWithinApk(const std::string& locale) {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - return Java_ResourceBundle_assetContainedInApk(
|
| - env,
|
| - base::android::GetApplicationContext(),
|
| - base::android::ConvertUTF8ToJavaString(env, filename).obj());
|
| + base::android::ScopedJavaLocalRef<jstring> ret =
|
| + Java_ResourceBundle_getLocalePakResourcePath(
|
| + env, base::android::ConvertUTF8ToJavaString(env, locale).obj());
|
| + if (ret.obj() == nullptr) {
|
| + return std::string();
|
| + }
|
| + return base::android::ConvertJavaStringToUTF8(env, ret.obj());
|
| }
|
|
|
| bool RegisterResourceBundleAndroid(JNIEnv* env) {
|
|
|