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

chrome/chrome_resources.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
   },
   'targets': [
     {
@@ skipping 168 matching lines @@
           'action_name': 'platform_locale_settings',
           'variables': {
             'grit_grd_file': '<(platform_locale_settings_grd)',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'theme_resources',
+      'target_name': 'theme_resources_gen',
       'type': 'none',
       'actions': [
         {
           'action_name': 'theme_resources',
           'variables': {
             'grit_grd_file': 'app/theme/theme_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           'action_name': 'theme_resources_2x',
           'variables': {
             'grit_grd_file': 'app/theme/theme_resources_2x.grd',
           },
           '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' ],
     },
     {
+      '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': {
         'repack_path': '../tools/grit/grit/format/repack.py',
       },
       'dependencies': [
         'chrome_extra_resources',
       ],
       'actions': [
         {
@@ skipping 28 matching lines @@
         'chrome_strings',
         'platform_locale_settings',
         'theme_resources',
         # TODO(zork): Protect this with if use_aura==1
         '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(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',
       ],
       'actions': [
         {
           'includes': ['chrome_repack_chrome.gypi']
         },
         {
           'includes': ['chrome_repack_locales.gypi']
         },
@@ skipping 38 matching lines @@
                   'files': ['<@(default_apps_list)']
                 },
               ],
             }],
           ], # conditions
         }], # end OS != "mac"
       ], # conditions
     },
   ], # targets
 }