diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 21:37:47 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 21:37:47 +0000 |
commit | 5fbd3a8dbfd03ce67b31bbcf743d1f90de76ea6e (patch) | |
tree | 80b8c34de2d1f2fb96e2fff73b95f082234413e4 /chrome/app | |
parent | 35718373041a66343f6a5807c7deaf64549b1cee (diff) | |
download | chromium_src-5fbd3a8dbfd03ce67b31bbcf743d1f90de76ea6e.zip chromium_src-5fbd3a8dbfd03ce67b31bbcf743d1f90de76ea6e.tar.gz chromium_src-5fbd3a8dbfd03ce67b31bbcf743d1f90de76ea6e.tar.bz2 |
Remove chrome.pak references, build resources into resources.pak
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.
TBR=tony@chromium.org
BUG=52609
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822
Review URL: https://codereview.chromium.org/22339020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/chrome_main_delegate.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index e5dafb5..0d0f61e 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -662,7 +662,6 @@ void ChromeMainDelegate::PreSandboxStartup() { ResourceBundle::InitSharedInstanceWithPakFile(locale_pak_fd, false); int extra_pak_keys[] = { - kAndroidChromePakDescriptor, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, }; |