diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 15:48:16 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 15:48:16 +0000 |
| commit | 5c586489b82900dfd5a12a158d5a23634defe54a (patch) | |
| tree | 0b0aaf50ca061063d3f4b40f3a03d0f6537621fb /tools | |
| parent | 08be10fd1984246b651d41ce759a5e189ecea439 (diff) | |
| download | chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.zip chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.gz chromium_src-5c586489b82900dfd5a12a158d5a23634defe54a.tar.bz2 | |
Switch Chromium to use Blink's blink_resources.grd
WebKit.grd is deprecated, so we update it public/blink_resources.grd.
R=darin@chromium.org, joth@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/19537010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gritsettings/resource_ids | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index fdab9ca..921b714 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": { + "third_party/WebKit/public/blink_resources.grd": { "includes": [8500], }, - "WebKit.grd": { - "includes": [8500], - }, - "ui/base/strings/app_locale_settings.grd": { "messages": [9000], }, |