| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index b5d5707cd82b905779a85d045b261e1b15734110..8d0aa5473ced23089782cdc403a27789813eb041 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -164,18 +164,12 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
|
|
|
| // static
|
| std::string ResourceBundle::InitSharedInstanceWithLocale(
|
| - 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;
|
| -}
|
| -
|
| -// static
|
| -std::string ResourceBundle::InitSharedInstanceLocaleOnly(
|
| - const std::string& pref_locale, Delegate* delegate) {
|
| + const std::string& pref_locale,
|
| + Delegate* delegate,
|
| + LoadResources load_resources) {
|
| InitSharedInstance(delegate);
|
| + if (load_resources == LOAD_COMMON_RESOURCES)
|
| + g_shared_instance_->LoadCommonResources();
|
| std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
|
| InitDefaultFontList();
|
| return result;
|
|
|