summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 19:37:49 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 19:37:49 +0000
commitf8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd (patch)
treed9e4007577c580fee5dc364484809ff1a682e405 /webkit/tools
parentfcd4ccd070f7ee5c6b8d27d47a5784e752a14856 (diff)
downloadchromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.zip
chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.gz
chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.bz2
Revert 147288 - Renamed resource files to be more verbose, specifically:
[ui,theme]_resources_standard.[pak,rc] changed to .._resources_100_percent.. and likewise [ui,theme]_resources_2x.pak changed to .._resources_200_percent.pak BUG=120185 TEST=run chome,ash_shell confirm assets loaded Review URL: https://chromiumcodereview.appspot.com/10694170 TBR=harrym@chromium.org Review URL: https://chromiumcodereview.appspot.com/10806018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 2b0320f..2ac3fae 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -174,7 +174,7 @@
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',