diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:52:22 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:52:22 +0000 |
| commit | e5f893b25b75168a7cabc12ec1a9459d7e78b3fe (patch) | |
| tree | 0478c8b1eecf0e3ddf8dc04d5f7bd8afc7e25d8f /tools/gritsettings | |
| parent | 3a0816fecc98fe7fc4b7b2f200ab9f3661bb1be2 (diff) | |
| download | chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.zip chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.tar.gz chromium_src-e5f893b25b75168a7cabc12ec1a9459d7e78b3fe.tar.bz2 | |
Reland "Include entries to blink_resources."
This was reverted in r214248 because it increased the size of chrome.pak.
R=abarth@chromium.org, joth@chromium.org, thestig@chromium.org,taysom@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/21121005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
| -rw-r--r-- | tools/gritsettings/resource_ids | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index fdab9ca..8000821 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -66,15 +66,9 @@ "chrome_frame/resources/chrome_frame_resources.grd": { "includes": [8000], }, - # WebKit.grd can be in two different places depending on whether we are - # in a chromium checkout or a webkit-only checkout. "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": { "includes": [8500], }, - "WebKit.grd": { - "includes": [8500], - }, - "ui/base/strings/app_locale_settings.grd": { "messages": [9000], }, @@ -223,5 +217,8 @@ "components/component_strings.grd": { "messages": [30000], }, + "third_party/WebKit/public/blink_resources.grd": { + "includes": [30500], + }, # Resource ids starting at 31000 are reserved for projects built on Chromium. } |