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 /chrome/browser/chrome_content_browser_client.cc | |
| 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 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index e3e1e69..380aa2a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2443,16 +2443,10 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( DCHECK(!data_path.empty()); int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ; - base::FilePath chrome_pak = data_path.AppendASCII("chrome.pak"); - base::PlatformFile f = - base::CreatePlatformFile(chrome_pak, flags, NULL, NULL); - DCHECK(f != base::kInvalidPlatformFileValue); - mappings->push_back(FileDescriptorInfo(kAndroidChromePakDescriptor, - FileDescriptor(f, true))); - base::FilePath chrome_resources_pak = data_path.AppendASCII("chrome_100_percent.pak"); - f = base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL); + base::PlatformFile f = + base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL); DCHECK(f != base::kInvalidPlatformFileValue); mappings->push_back(FileDescriptorInfo(kAndroidChrome100PercentPakDescriptor, FileDescriptor(f, true))); |