Revert 132760 - Metro/HiDPI: Move 1x icons into separate pak file

chrome/chrome_resources.gyp

Index: chrome/chrome_resources.gyp
===================================================================
--- chrome/chrome_resources.gyp	(revision 132803)
+++ chrome/chrome_resources.gyp	(working copy)
@@ -193,7 +193,7 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'theme_resources_gen',
+      'target_name': 'theme_resources',
       'type': 'none',
       'actions': [
         {
@@ -221,48 +221,6 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'theme_resources',
-      'type': 'none',
-      'dependencies': [
-        'theme_resources_gen',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_2x',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
-      ],
-      'conditions': [
-        ['OS != "mac"', {
-          # Copy pak files to the product directory. These files will be picked
-          # up by the following installer scripts:
-          #   - Windows: chrome/installer/mini_installer/chrome.release
-          #   - Linux: chrome/installer/linux/internal/common/installer.include
-          # Ensure that the above scripts are updated when adding or removing
-          # pak files.
-          # Coping files to the product directory is not needed on the Mac
-          # since the framework build phase will copy them into the framework
-          # bundle directly.
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(grit_out_dir)/theme_resources_standard.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
-              ],
-            },
-          ],
-        }],
-        ['OS != "mac" and enable_hidpi == 1', {
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(grit_out_dir)/theme_resources_2x.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak',
-              ],
-            },
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'packed_extra_resources',
       'type': 'none',
       'variables': {
@@ -311,6 +269,8 @@
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/ui.gyp:ui_resources_2x',
+        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],