Revert 132517 - 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 201 matching lines @@
         },
         {
           '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' ],
-      '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',
       ],
@@ skipping 90 matching lines @@
                   'files': ['<@(default_apps_list)']
                 },
               ],
             }],
           ], # conditions
         }], # end OS != "mac"
       ], # conditions
     },
   ], # targets
 }