| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 std::unique_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P)); | 108 std::unique_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P)); |
| 109 if (!data_pack->LoadFromFileRegion(base::File(g_locale_pack_fd), | 109 if (!data_pack->LoadFromFileRegion(base::File(g_locale_pack_fd), |
| 110 g_locale_pack_region)) { | 110 g_locale_pack_region)) { |
| 111 LOG(ERROR) << "failed to load locale.pak"; | 111 LOG(ERROR) << "failed to load locale.pak"; |
| 112 NOTREACHED(); | 112 NOTREACHED(); |
| 113 return std::string(); | 113 return std::string(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 locale_resources_data_.reset(data_pack.release()); | 116 locale_resources_data_ = std::move(data_pack); |
| 117 return app_locale; | 117 return app_locale; |
| 118 } | 118 } |
| 119 | 119 |
| 120 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { | 120 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { |
| 121 return GetImageNamed(resource_id); | 121 return GetImageNamed(resource_id); |
| 122 } | 122 } |
| 123 | 123 |
| 124 void SetLocalePaksStoredInApk(bool value) { | 124 void SetLocalePaksStoredInApk(bool value) { |
| 125 g_locale_paks_in_apk = value; | 125 g_locale_paks_in_apk = value; |
| 126 } | 126 } |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 base::android::ScopedJavaLocalRef<jstring> ret = | 160 base::android::ScopedJavaLocalRef<jstring> ret = |
| 161 Java_ResourceBundle_getLocalePakResourcePath( | 161 Java_ResourceBundle_getLocalePakResourcePath( |
| 162 env, base::android::ConvertUTF8ToJavaString(env, locale)); | 162 env, base::android::ConvertUTF8ToJavaString(env, locale)); |
| 163 if (ret.obj() == nullptr) { | 163 if (ret.obj() == nullptr) { |
| 164 return std::string(); | 164 return std::string(); |
| 165 } | 165 } |
| 166 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); | 166 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); |
| 167 } | 167 } |
| 168 | 168 |
| 169 } // namespace ui | 169 } // namespace ui |
| OLD | NEW |