OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/base/resource/resource_bundle_android.h" | 5 #include "ui/base/resource/resource_bundle_android.h" |
6 | 6 |
7 #include "base/android/apk_assets.h" | 7 #include "base/android/apk_assets.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 *out_region = g_resources_pack_region; | 52 *out_region = g_resources_pack_region; |
53 return g_resources_pack_fd; | 53 return g_resources_pack_fd; |
54 } | 54 } |
55 | 55 |
56 int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) { | 56 int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) { |
57 DCHECK_GE(g_chrome_100_percent_fd, 0); | 57 DCHECK_GE(g_chrome_100_percent_fd, 0); |
58 *out_region = g_chrome_100_percent_region; | 58 *out_region = g_chrome_100_percent_region; |
59 return g_chrome_100_percent_fd; | 59 return g_chrome_100_percent_fd; |
60 } | 60 } |
61 | 61 |
62 bool AssetContainedInApk(const std::string& filename) { | 62 std::string GetPathForAndroidLocalePakWithinApk(const std::string& locale) { |
63 JNIEnv* env = base::android::AttachCurrentThread(); | 63 JNIEnv* env = base::android::AttachCurrentThread(); |
64 return Java_ResourceBundle_assetContainedInApk( | 64 base::android::ScopedJavaLocalRef<jstring> ret = |
65 env, | 65 Java_ResourceBundle_getLocalePakResourcePath( |
66 base::android::GetApplicationContext(), | 66 env, base::android::ConvertUTF8ToJavaString(env, locale).obj()); |
67 base::android::ConvertUTF8ToJavaString(env, filename).obj()); | 67 if (ret.obj() == nullptr) { |
| 68 return std::string(); |
| 69 } |
| 70 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); |
68 } | 71 } |
69 | 72 |
70 bool RegisterResourceBundleAndroid(JNIEnv* env) { | 73 bool RegisterResourceBundleAndroid(JNIEnv* env) { |
71 return RegisterNativesImpl(env); | 74 return RegisterNativesImpl(env); |
72 } | 75 } |
73 | 76 |
74 } | 77 } |
OLD | NEW |