| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 if (locale_file_path.empty()) { | 99 if (locale_file_path.empty()) { |
| 100 // It's possible that there is no locale.pak. | 100 // It's possible that there is no locale.pak. |
| 101 LOG(WARNING) << "locale_file_path.empty() for locale " << app_locale; | 101 LOG(WARNING) << "locale_file_path.empty() for locale " << app_locale; |
| 102 return std::string(); | 102 return std::string(); |
| 103 } | 103 } |
| 104 int flags = base::File::FLAG_OPEN | base::File::FLAG_READ; | 104 int flags = base::File::FLAG_OPEN | base::File::FLAG_READ; |
| 105 g_locale_pack_fd = base::File(locale_file_path, flags).TakePlatformFile(); | 105 g_locale_pack_fd = base::File(locale_file_path, flags).TakePlatformFile(); |
| 106 g_locale_pack_region = base::MemoryMappedFile::Region::kWholeFile; | 106 g_locale_pack_region = base::MemoryMappedFile::Region::kWholeFile; |
| 107 } | 107 } |
| 108 | 108 |
| 109 scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P)); | 109 std::unique_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P)); |
| 110 if (!data_pack->LoadFromFileRegion(base::File(g_locale_pack_fd), | 110 if (!data_pack->LoadFromFileRegion(base::File(g_locale_pack_fd), |
| 111 g_locale_pack_region)) { | 111 g_locale_pack_region)) { |
| 112 UMA_HISTOGRAM_ENUMERATION("ResourceBundle.LoadLocaleResourcesError", | 112 UMA_HISTOGRAM_ENUMERATION("ResourceBundle.LoadLocaleResourcesError", |
| 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()); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 return std::string(); | 167 return std::string(); |
| 168 } | 168 } |
| 169 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); | 169 return base::android::ConvertJavaStringToUTF8(env, ret.obj()); |
| 170 } | 170 } |
| 171 | 171 |
| 172 bool RegisterResourceBundleAndroid(JNIEnv* env) { | 172 bool RegisterResourceBundleAndroid(JNIEnv* env) { |
| 173 return RegisterNativesImpl(env); | 173 return RegisterNativesImpl(env); |
| 174 } | 174 } |
| 175 | 175 |
| 176 } // namespace ui | 176 } // namespace ui |
| OLD | NEW |