| 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..0078a8b690b9cb1fabb255c58988aeef6468e04e 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -162,11 +162,15 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
|
| DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource);
|
| };
|
|
|
| +ResourceBundle::InitParams::InitParams() : delegate(NULL) {}
|
| +
|
| +ResourceBundle::InitParams::~InitParams() {}
|
| +
|
| // static
|
| std::string ResourceBundle::InitSharedInstanceWithLocale(
|
| - const std::string& pref_locale, Delegate* delegate) {
|
| + const std::string& pref_locale,
|
| + Delegate* delegate) {
|
| InitSharedInstance(delegate);
|
| - g_shared_instance_->LoadCommonResources();
|
| std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
|
| InitDefaultFontList();
|
| return result;
|
| @@ -174,7 +178,8 @@ std::string ResourceBundle::InitSharedInstanceWithLocale(
|
|
|
| // static
|
| std::string ResourceBundle::InitSharedInstanceLocaleOnly(
|
| - const std::string& pref_locale, Delegate* delegate) {
|
| + const std::string& pref_locale,
|
| + Delegate* delegate) {
|
| InitSharedInstance(delegate);
|
| std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
|
| InitDefaultFontList();
|
| @@ -187,11 +192,8 @@ void ResourceBundle::InitSharedInstanceWithPakFileRegion(
|
| 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));
|
| + 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;
|
|
|