Rename theme_resources_metro_1x.grd to theme_resources_touch_1x.grd

chrome/chrome_resources.gyp

Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 8a515ff7c3ef2ca33ce98585b8775ecf37eaf138..cb49de0e1f6d29dc842fad4516798dd9042ba9d9 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -218,9 +218,9 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'theme_resources_metro_1x',
+          'action_name': 'theme_resources_touch_1x',
           'variables': {
-            'grit_grd_file': 'app/theme/theme_resources_metro_1x.grd',
+            'grit_grd_file': 'app/theme/theme_resources_touch_1x.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
@@ -278,12 +278,13 @@
             },
           ],
         }],
-        ['enable_metro == 1', {
+        # Touch enabled platforms.
+        ['enable_metro == 1 or use_ash == 1', {

[sky, 2012/04/30 22:43:48]

I don't know how pervasive enable_metro is. Would it be better to rename
enable_metro to enable_touch? Another option is to add an enable_touch that is
set if enable_metro is set or use_ash. 

[James Cook, 2012/04/30 22:55:29]

Oops, that wasn't supposed to be part of this CL.  I'll remove from this CL and
do that in the next one that actually hooks theme_resources_touch into ash.

           'copies': [
             {
               'destination': '<(PRODUCT_DIR)',
               'files': [
-                '<(grit_out_dir)/theme_resources_metro_1x.pak',
+                '<(grit_out_dir)/theme_resources_touch_1x.pak',
               ],
             },
           ],