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

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

Issue 419093002: ui: Remove ResourceBundle::LoadCommonResources(). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitParams 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
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..fa98a1ce4a7c90dbe07339ccbad250034eaec82e 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -164,9 +164,9 @@ class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
// 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 +174,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();
@@ -190,8 +191,7 @@ void ResourceBundle::InitSharedInstanceWithPakFileRegion(
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;

Powered by Google App Engine
This is Rietveld 408576698