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