diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 08:36:52 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 08:36:52 +0000 |
| commit | d190eea8280153c69c28c1e731cb88cf5763bda7 (patch) | |
| tree | 7b4ae1b1a342b4e74f533ee114156969a74927a1 /chrome/common/descriptors_android.h | |
| parent | 8681322ed023bc2f0a5211b837634b195766e546 (diff) | |
| download | chromium_src-d190eea8280153c69c28c1e731cb88cf5763bda7.zip chromium_src-d190eea8280153c69c28c1e731cb88cf5763bda7.tar.gz chromium_src-d190eea8280153c69c28c1e731cb88cf5763bda7.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
TBR=phajdan.jr@chromium.org for chrome/installer/linux
Review URL: https://chromiumcodereview.appspot.com/23205023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/descriptors_android.h')
| -rw-r--r-- | chrome/common/descriptors_android.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/descriptors_android.h b/chrome/common/descriptors_android.h index 16886e9..f18a8c6 100644 --- a/chrome/common/descriptors_android.h +++ b/chrome/common/descriptors_android.h @@ -9,8 +9,7 @@ enum { #if defined(OS_ANDROID) - kAndroidChromePakDescriptor = kContentIPCDescriptorMax + 1, - kAndroidLocalePakDescriptor, + kAndroidLocalePakDescriptor = kContentIPCDescriptorMax + 1, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, kAndroidMinidumpDescriptor, |