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

Currently all 1x art files are repacked into chrome.pak files.

This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale.

As a first step this CL does the following:
 - add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome.
 - stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak
 - update the Mac and Windows installer code to package the extra pak files.

Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation.

BUG=114311
TEST=Ran on Windows, and Mac and Linux.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132517

Review URL: http://codereview.chromium.org/10024050

TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10115031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132804 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 43 deletions

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 18f88fb..9834578 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -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',
       ],