Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698