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 /content/content_shell.gypi | |
| 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 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 129c2a2..e2fe149 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -319,7 +319,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], |