summaryrefslogtreecommitdiffstats
path: root/ui/ui_resources.gypi
diff options
context:
space:
mode:
authorbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 18:40:27 +0000
committerbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 18:40:27 +0000
commitc7b2fa3f761dfa9652e3528387758d5e508f2dea (patch)
tree12c9338eb07324dad4fbc842237e4304704a99f5 /ui/ui_resources.gypi
parentcfe60a4939c15be90fe2d19422a47321a0fb88d5 (diff)
downloadchromium_src-c7b2fa3f761dfa9652e3528387758d5e508f2dea.zip
chromium_src-c7b2fa3f761dfa9652e3528387758d5e508f2dea.tar.gz
chromium_src-c7b2fa3f761dfa9652e3528387758d5e508f2dea.tar.bz2
Merge scalable-image grd files using new support in Grit (r51).
{theme,ui}_resources_{standard,2x,touch,touch_1x,touch_2x}.grd are merged into {theme,ui}_resources_standard.grd. The only visible change should be that theme_resources_2x used to point to the 100% version of settings_favicon.png, but now picks up the 200% version. I checked the 200% image and it looks fine. Note that this changes the resource IDs because of a grit bug related to processing of <if> nodes. BUG=131216 TEST=Existing tests, visual inspection, pak files unchanged except for settings_favicon.png and different resource IDs Review URL: https://chromiumcodereview.appspot.com/10562030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_resources.gypi')
-rw-r--r--ui/ui_resources.gypi51
1 files changed, 0 insertions, 51 deletions
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 6b1e312..78d639e 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -22,23 +22,6 @@
'includes': [ '../build/grit_target.gypi' ],
},
{
- 'target_name': 'ui_resources_2x',
- 'type': 'none',
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x',
- },
- 'actions': [
- {
- 'action_name': 'ui_resources_2x',
- 'variables': {
- 'grit_grd_file': 'resources/ui_resources_2x.grd',
- },
- 'includes': [ '../build/grit_action.gypi' ],
- },
- ],
- 'includes': [ '../build/grit_target.gypi' ],
- },
- {
'target_name': 'ui_resources_standard',
'type': 'none',
'variables': {
@@ -65,39 +48,5 @@
],
'includes': [ '../build/grit_target.gypi' ],
},
- {
- 'target_name': 'ui_resources_touch',
- 'type': 'none',
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch',
- },
- 'actions': [
- {
- 'action_name': 'ui_resources_touch',
- 'variables': {
- 'grit_grd_file': 'resources/ui_resources_touch.grd',
- },
- 'includes': [ '../build/grit_action.gypi' ],
- },
- ],
- 'includes': [ '../build/grit_target.gypi' ],
- },
- {
- 'target_name': 'ui_resources_touch_2x',
- 'type': 'none',
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch_2x',
- },
- 'actions': [
- {
- 'action_name': 'ui_resources_touch_2x',
- 'variables': {
- 'grit_grd_file': 'resources/ui_resources_touch_2x.grd',
- },
- 'includes': [ '../build/grit_action.gypi' ],
- },
- ],
- 'includes': [ '../build/grit_target.gypi' ],
- },
],
}