summaryrefslogtreecommitdiffstats
path: root/ui/resources
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 /ui/resources
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 'ui/resources')
-rw-r--r--ui/resources/ui_resources.grd10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index b1c732c..c165065 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -9,11 +9,11 @@
<!-- TODO(oshima): Remove gfx_resources.pak once DumpRenderTree.gyp
is updated. -->
<output filename="gfx_resources.pak" type="data_package" context="default_100_percent" />
- <output filename="ui_resources_100_percent.pak" type="data_package" context="default_100_percent" />
- <output filename="ui_resources_200_percent.pak" type="data_package" context="default_200_percent" />
- <output filename="ui_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
- <output filename="ui_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
- <output filename="ui_resources_100_percent.rc" type="rc_all" context="default_100_percent" />
+ <output filename="ui_resources_standard.pak" type="data_package" context="default_100_percent" />
+ <output filename="ui_resources_2x.pak" type="data_package" context="default_200_percent" />
+ <output filename="ui_resources_touch.pak" type="data_package" context="touch_100_percent" />
+ <output filename="ui_resources_touch_2x.pak" type="data_package" context="touch_200_percent" />
+ <output filename="ui_resources_standard.rc" type="rc_all" context="default_100_percent" />
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">