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

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: Created 6 years, 5 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 d912a27eea54b6aa1bf22affc6cbbf4ebf69aeda..161e3816ee8f14fdeb0f01d9e9468b7d98e3959b 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -156,9 +156,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;
@@ -166,7 +166,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();
@@ -174,14 +175,9 @@ std::string ResourceBundle::InitSharedInstanceLocaleOnly(
}
// static
-void ResourceBundle::InitSharedInstanceWithPakFile(
- base::File pak_file, bool should_load_common_resources) {
+void ResourceBundle::InitSharedInstanceWithPakFile(base::File pak_file) {
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->LoadFromFile(pak_file.Pass())) {
NOTREACHED() << "failed to load pak file";
return;

Powered by Google App Engine
This is Rietveld 408576698