Merge theme_resources_large and theme_resources_standard targets

into theme_resources.  This gives us less .vcproj and .xcodeproject
files on Win/Mac making things load a bit quicker.

Also remove unused generated files from 
theme_resoures_large.grd.

BUG=None
TEST=compiles


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

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

5 files changed, 0 insertions, 30 deletions

diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index 7b712db..3fa643f 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -4,10 +4,7 @@
     <output filename="grit/theme_resources_large.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="grit/theme_resources_large_map.cc" type="resource_map_source" />
-    <output filename="grit/theme_resources_large_map.h" type="resource_map_header" />
     <output filename="theme_resources_large.pak" type="data_package" />
-    <output filename="theme_resources_large.rc" type="rc_all" />
   </outputs>
   <release seq="1">
     <includes>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a6c2321..226ed0e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -229,13 +229,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'theme_resources_large',
-      'type': 'none',
-      'actions': [
         {
           'action_name': 'theme_resources_large',
           'variables': {
@@ -243,13 +236,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'theme_resources_standard',
-      'type': 'none',
-      'actions': [
         {
           'action_name': 'theme_resources_standard',
           'variables': {
@@ -405,7 +391,6 @@
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:base',
         '../content/content.gyp:content_browser',
         '../net/net.gyp:http_server',
@@ -1487,7 +1472,6 @@
           'type': 'static_library',
           'dependencies': [
             'theme_resources',
-            'theme_resources_standard',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
@@ -1591,8 +1575,6 @@
           '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',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9d85137..4993c3d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -26,8 +26,6 @@
         'syncapi_core',
         'syncapi_service',
         'theme_resources',
-        'theme_resources_large',
-        'theme_resources_standard',
         'userfeedback_proto',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
@@ -3860,7 +3858,6 @@
         '<(grit_out_dir)/grit/devtools_resources_map.cc',
         '<(grit_out_dir)/grit/shared_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
-        '<(grit_out_dir)/grit/theme_resources_large_map.cc',
         '<(grit_out_dir)/grit/theme_resources_standard_map.cc',
 
         # This file is generated by the autofill_regexes action.
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index c107ee2..153ee38 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -29,7 +29,6 @@
         'common_net',
         'default_plugin/default_plugin.gyp:default_plugin',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_static',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 05fcf5f..d9a098a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -31,7 +31,6 @@
         'app/policy/cloud_policy_codegen.gyp:policy',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:test_support_content',
@@ -235,7 +234,6 @@
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
-        'theme_resources_standard',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -398,7 +396,6 @@
         'test_support_common',
         'test_support_ui',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/libxml/libxml.gyp:libxml',
@@ -2757,7 +2754,6 @@
         'test_support_common',
         'test_support_ui',
         'theme_resources',
-        'theme_resources_standard',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -3629,7 +3625,6 @@
             'chrome_resources',
             'chrome_strings',
             'theme_resources',
-            'theme_resources_standard',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],