Merge theme_resources_large and theme_resources_standard targets

chrome/chrome.gyp

 # Copyright (c) 2011 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': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 211 matching lines @@
       'target_name': 'theme_resources',
       'type': 'none',
       'actions': [
         {
           'action_name': 'theme_resources',
           'variables': {
             'grit_grd_file': 'app/theme/theme_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-      ],
-      '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' ],
     },
@@ skipping 135 matching lines @@
     },
     {
       # TODO(joi): Move debugger-related build rules to content/
       'target_name': 'debugger',
       'type': 'static_library',
       'dependencies': [
         'chrome_extra_resources',
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:base',
         '../content/content.gyp:content_browser',
         '../net/net.gyp:http_server',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
       ],
       'include_dirs': [
@@ skipping 1059 matching lines @@
               ],
               'message': 'Generating version header file: <@(_outputs)',
             },
           ],
         },
         {
           'target_name': 'automation',
           'type': 'static_library',
           'dependencies': [
             'theme_resources',
-            'theme_resources_standard',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
              'test/automation/automation_handle_tracker.cc',
              'test/automation/automation_handle_tracker.h',
@@ skipping 83 matching lines @@
           'repack_path': '../tools/grit/grit/format/repack.py',
         },
         'dependencies': [
           # MSVS needs the dependencies explictly named, Make is able to
           # derive the dependencies from the output files.
           'chrome_resources',
           'chrome_strings',
           'default_plugin/default_plugin.gyp:default_plugin_resources',
           'platform_locale_settings',
           'theme_resources',
-          'theme_resources_standard',
-          'theme_resources_large',
           '<(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_large',
           '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
           '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
           '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
         ],
         'actions': [
@@ skipping 115 matching lines @@
             'destination': '<(PRODUCT_DIR)',
             'files': [
               '<(INTERMEDIATE_DIR)/repack/chrome.pak'
             ],
           },
         ],
       }],  # targets
     }],  # OS != "mac"
   ],  # 'conditions'
 }