| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 logging::GetLastSystemErrorCode(), 16000); | 113 logging::GetLastSystemErrorCode(), 16000); |
| 114 LOG(ERROR) << "failed to load locale.pak"; | 114 LOG(ERROR) << "failed to load locale.pak"; |
| 115 NOTREACHED(); | 115 NOTREACHED(); |
| 116 return std::string(); | 116 return std::string(); |
| 117 } | 117 } |
| 118 | 118 |
| 119 locale_resources_data_.reset(data_pack.release()); | 119 locale_resources_data_.reset(data_pack.release()); |
| 120 return app_locale; | 120 return app_locale; |
| 121 } | 121 } |
| 122 | 122 |
| 123 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { | 123 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { |
| 124 // Flipped image is not used on Android. | |
| 125 DCHECK_EQ(rtl, RTL_DISABLED); | |
| 126 return GetImageNamed(resource_id); | 124 return GetImageNamed(resource_id); |
| 127 } | 125 } |
| 128 | 126 |
| 129 void SetLocalePaksStoredInApk(bool value) { | 127 void SetLocalePaksStoredInApk(bool value) { |
| 130 g_locale_paks_in_apk = value; | 128 g_locale_paks_in_apk = value; |
| 131 } | 129 } |
| 132 | 130 |
| 133 void LoadMainAndroidPackFile(const char* path_within_apk, | 131 void LoadMainAndroidPackFile(const char* path_within_apk, |
| 134 const base::FilePath& disk_file_path) { | 132 const base::FilePath& disk_file_path) { |
| 135 if (LoadFromApkOrFile(path_within_apk, | 133 if (LoadFromApkOrFile(path_within_apk, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 return std::string(); | 167 return std::string(); |
| 170 } | 168 } |
| 171 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); | 169 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); |
| 172 } | 170 } |
| 173 | 171 |
| 174 bool RegisterResourceBundleAndroid(JNIEnv* env) { | 172 bool RegisterResourceBundleAndroid(JNIEnv* env) { |
| 175 return RegisterNativesImpl(env); | 173 return RegisterNativesImpl(env); |
| 176 } | 174 } |
| 177 | 175 |
| 178 } // namespace ui | 176 } // namespace ui |
| OLD | NEW |