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

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

Issue 451283002: Drop the bool parameter from InitSharedInstanceWithPakFileRegion(). (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') | no next file » | 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 c7e6834586bbde2c0e70cd6e9b46081ead31db2b..b5d5707cd82b905779a85d045b261e1b15734110 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -184,14 +184,9 @@ std::string ResourceBundle::InitSharedInstanceLocaleOnly(
// static
void ResourceBundle::InitSharedInstanceWithPakFileRegion(
base::File pak_file,
- const base::MemoryMappedFile::Region& region,
- bool should_load_common_resources) {
+ const base::MemoryMappedFile::Region& region) {
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;
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698