Merge grd files in ui/resources and chrome/app/theme

chrome/chrome_resources.gyp

Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 505949d8a4ffe2af973db44e484d83027832352c..78be1d3e55a8875946bf2d5286ffe7da7b01546b 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -211,13 +211,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-        {
-          'action_name': 'theme_resources_standard',
-          'variables': {
-            'grit_grd_file': 'app/theme/theme_resources_standard.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
@@ -226,7 +219,7 @@
       'type': 'none',
       'dependencies': [
         'theme_resources_gen',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
+        '<(DEPTH)/ui/ui.gyp:ui_resources',
       ],
       'conditions': [
         ['OS != "mac"', {
@@ -244,7 +237,7 @@
               'destination': '<(PRODUCT_DIR)',
               'files': [
                 '<(grit_out_dir)/theme_resources_standard.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
               ],
             },
           ],
@@ -255,7 +248,7 @@
               'destination': '<(PRODUCT_DIR)',
               'files': [
                 '<(grit_out_dir)/theme_resources_2x.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_2x.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak',
               ],
             },
           ],
@@ -267,8 +260,8 @@
               'files': [
                 '<(grit_out_dir)/theme_resources_touch_1x.pak',
                 '<(grit_out_dir)/theme_resources_touch_2x.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_touch.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_touch_2x.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch.pak',
+                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_2x.pak',
               ],
             },
           ],
@@ -323,7 +316,6 @@
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],