diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 05:33:09 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 05:33:09 +0000 |
| commit | 5db2b749d3f5d907fc490baa4bd5935dc21737d4 (patch) | |
| tree | 3c2c17e4b8acde4c19cecb72cf04519cdb06906b /ui/base | |
| parent | 4aec86591ca558cc64db05a8ab7dbc14dee7aec9 (diff) | |
| download | chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.zip chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.tar.gz chromium_src-5db2b749d3f5d907fc490baa4bd5935dc21737d4.tar.bz2 | |
Remove chrome.pak references, build resources into resources.pak (try 2)
This puts resources that used to be in chrome.pak and/or compiled in to
chrome.dll into resources.pak. resources.pak is already loaded at startup
on all platforms so having some resources in a separate pak file isn't
beneficial.
This previously landed as https://codereview.chromium.org/22339020 and
was reverted due to various scripts/etc still referencing chrome.pak. This
patch still builds chrome.pak, but with only the (tiny) net_resources in
it. After this lands I'll go remove references to chrome.pak and then remove
it completely once all references are gone.
BUG=52609
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218956
R=phajdan.jr@chromium.org, sky@chromium.org, tony@chromium.org
Review URL: https://codereview.chromium.org/23205023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/resource/resource_bundle_android.cc | 2 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_auralinux.cc | 3 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_gtk.cc | 2 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc index c701a291..b194269 100644 --- a/ui/base/resource/resource_bundle_android.cc +++ b/ui/base/resource/resource_bundle_android.cc @@ -19,8 +19,6 @@ namespace ui { void ResourceBundle::LoadCommonResources() { base::FilePath path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &path); - AddDataPackFromPath(path.AppendASCII("chrome.pak"), - SCALE_FACTOR_NONE); AddDataPackFromPath(path.AppendASCII("chrome_100_percent.pak"), SCALE_FACTOR_100P); } diff --git a/ui/base/resource/resource_bundle_auralinux.cc b/ui/base/resource/resource_bundle_auralinux.cc index 4bc7ee6..d535717 100644 --- a/ui/base/resource/resource_bundle_auralinux.cc +++ b/ui/base/resource/resource_bundle_auralinux.cc @@ -33,9 +33,6 @@ void ResourceBundle::LoadCommonResources() { // Always load the 1x data pack first as the 2x data pack contains both 1x and // 2x images. The 1x data pack only has 1x images, thus passes in an accurate // scale factor to gfx::ImageSkia::AddRepresentation. - - AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), - SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc index 4d16b61..679b85c 100644 --- a/ui/base/resource/resource_bundle_gtk.cc +++ b/ui/base/resource/resource_bundle_gtk.cc @@ -65,8 +65,6 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) { } // namespace void ResourceBundle::LoadCommonResources() { - AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), - SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath( "chrome_100_percent.pak"), SCALE_FACTOR_100P); diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 5de8ecc..56d16d5 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -49,8 +49,6 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { } // namespace void ResourceBundle::LoadCommonResources() { - AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil), - SCALE_FACTOR_NONE); AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil), SCALE_FACTOR_100P); AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent", |