Add support for multi resolution icons

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b0ffac6d3be4d9932815aa73f81b23c351897387..9f031ee8850a97f50c3d7e5fb783ec41c292c253 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -240,6 +240,34 @@
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
+      'target_name': 'theme_resources_large',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'theme_resources_large',
+          'variables': {
+            'grit_grd_file': 'app/theme/theme_resources_large.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+      'includes': [ '../build/grit_target.gypi' ],
+    },
+    {
+      'target_name': 'theme_resources_standard',
+      'type': 'none',
+      'actions': [
+        {
+          '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': 'platform_locale_settings',
       'type': 'none',
       'actions': [
@@ -355,6 +383,7 @@
         'chrome_strings',
         '../net/net.gyp:http_server',
         'theme_resources',
+        'theme_resources_standard',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ -1411,6 +1440,7 @@
           'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
           'dependencies': [
             'theme_resources',
+            'theme_resources_standard',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
@@ -1499,10 +1529,22 @@
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
               ],
+              'conditions': [
+                ['touchui=="0"', {
+                  'theme_resources_inputs': [
+                    '<(grit_out_dir)/theme_resources_standard.pak',
+                  ],
+                }, {  # else: touchui!="0"
+                  'theme_resources_inputs': [
+                    '<(grit_out_dir)/theme_resources_large.pak',
+                  ],
+                }],
+              ],
             },
             'inputs': [
               '<(repack_path)',
               '<@(pak_inputs)',
+              '<@(theme_resources_inputs)',
             ],
             'outputs': [
               '<(INTERMEDIATE_DIR)/repack/chrome.pak',