summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 18:54:45 +0000
committertbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 18:54:45 +0000
commit97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed (patch)
tree147036703b003a7fa3c1e4f8997e80d819b1f454 /tools
parent4440f3922624f4389cdfe586b60d324ce5fcc014 (diff)
downloadchromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.zip
chromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.tar.gz
chromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.tar.bz2
Revert "Revert 188259 "Move the webkit cursor resources to ui\resources\...""
I shouldn't have rolled this back because there were follow-up fixes that had already gone in: crrev.com/188264 crrev.com/188392 TBR=sky@chromium.org, brettw@chromium.org Review URL: https://codereview.chromium.org/12550014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/gritsettings/resource_ids2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 58ed602..5394e05 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -41,7 +41,7 @@
"net/base/net_resources.grd": {
"includes": [4000],
},
- "webkit/glue/resources/webkit_unscaled_resources.grd": {
+ "ui/resources/ui_unscaled_resources.grd": {
"includes": [4500],
},
"webkit/glue/resources/webkit_resources.grd": {