| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index 95fd2f299785c3e7983f0287e6406207f4648aa5..0ae79240b95a1aac6aed57ed85a1abb7ef6b1933 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -174,15 +174,17 @@ std::string ResourceBundle::InitSharedInstanceLocaleOnly(
|
| }
|
|
|
| // static
|
| -void ResourceBundle::InitSharedInstanceWithPakFile(
|
| - base::File pak_file, bool should_load_common_resources) {
|
| +void ResourceBundle::InitSharedInstanceWithPakFileRegion(
|
| + base::File pak_file,
|
| + const base::MemoryMappedFile::Region& region,
|
| + bool should_load_common_resources) {
|
| InitSharedInstance(NULL);
|
| if (should_load_common_resources)
|
| g_shared_instance_->LoadCommonResources();
|
|
|
| scoped_ptr<DataPack> data_pack(
|
| new DataPack(SCALE_FACTOR_100P));
|
| - if (!data_pack->LoadFromFile(pak_file.Pass())) {
|
| + if (!data_pack->LoadFromFileRegion(pak_file.Pass(), region)) {
|
| NOTREACHED() << "failed to load pak file";
|
| return;
|
| }
|
|
|