Remove themes/default.dll and merge the resources into chrome.dll.

chrome/chrome.gyp

 # Copyright (c) 2009 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',
@@ skipping 4805 matching lines @@
             'test/data/resource.rc',
 
             '<@(views_unit_tests_sources)',
             '<@(views_unit_tests_sources_win_specific)',
 
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
+            '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
           'sources!': [
             'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
           'link_settings': {
             'libraries': [
               '-lcomsupp.lib',
@@ skipping 678 matching lines @@
               'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9',
               'include_dirs': [
                 'third_party/wtl/include',
               ],
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
                 'chrome_dll_version',
                 'chrome_resources',
                 'installer/installer.gyp:installer_util_strings',
-                'theme_dll',
                 'worker',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
                 '../build/util/support/support.gyp:*',
                 '../third_party/cld/cld.gyp:cld',
                 '../views/views.gyp:views',
                 '../webkit/webkit.gyp:webkit_resources',
                 '../gears/gears.gyp:gears',
               ],
               'defines': [
@@ skipping 15 matching lines @@
                 '../webkit/glue/resources/row_resize.cur',
                 '../webkit/glue/resources/vertical_text.cur',
                 '../webkit/glue/resources/zoom_in.cur',
                 '../webkit/glue/resources/zoom_out.cur',
 
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
                 # their various targets (net.gyp:net_resources, etc.),
                 # but that causes errors in other targets when
                 # resulting .res files get referenced multiple times.
+                '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
 
                 # TODO(sgk):  left-over from pre-gyp build, figure out
                 # if we still need them and/or how to update to gyp.
                 #'app/check_dependents.bat',
                 #'app/chrome.dll.deps',
               ],
               'msvs_settings': {
                 'VCLinkerTool': {
@@ skipping 983 matching lines @@
               'test/live_sync/two_client_live_bookmarks_sync_test.cc',
               'test/test_launcher/run_all_unittests.cc',
               'test/test_notification_tracker.cc',
               'test/test_notification_tracker.h',
               'test/testing_browser_process.h',
               'test/ui_test_utils_linux.cc',
               'test/ui_test_utils_mac.cc',
               'test/ui_test_utils_win.cc',
               'test/data/resource.h',
               'test/data/resource.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+              '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             ],
             'conditions': [
               # Plugin code.
               ['OS=="linux" or OS=="win"', {
                 'dependencies': [
                   'plugin',
                  ],
                 'export_dependent_settings': [
                   'plugin',
                 ],
@@ skipping 67 matching lines @@
             'test/in_process_browser_test.h',
             'test/test_launcher/run_all_unittests.cc',
             'test/unit/chrome_test_suite.h',
             'test/ui_test_utils.cc',
             'test/ui_test_utils_linux.cc',
             'test/ui_test_utils_mac.cc',
             'test/ui_test_utils_win.cc',
             'app/chrome_dll.rc',
             'app/chrome_dll_resource.h',
             'app/chrome_dll_version.rc.version',
+            '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             # browser_tests_sources and browser_tests_source_win_specific are
             # defined in 'variables' at the top of the file.
             '<@(browser_tests_sources)',
             '<@(browser_tests_sources_win_specific)',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
               ],
@@ skipping 190 matching lines @@
             'libraries': [
               '-lwinmm.lib',
             ],
           },
           'sources': [
             'test/chrome_plugin/test_chrome_plugin.cc',
             'test/chrome_plugin/test_chrome_plugin.def',
             'test/chrome_plugin/test_chrome_plugin.h',
           ],
         },
-        {
-          'target_name': 'theme_dll',
-          'type': 'loadable_module',
-          'msvs_guid': 'FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D',
-          'product_name': 'default',
-          'dependencies': [
-            'theme_resources',
-            '../app/app.gyp:app_resources',
-          ],
-          'sources': [
-            '<(grit_out_dir)/theme_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.rc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'BaseAddress': '0x3CE00000',
-              'OutputFile': '<(PRODUCT_DIR)/themes/default.dll',
-              'ResourceOnlyDLL': 'true',
-            },
-          },
-          'configurations': {
-            'Debug': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-            'Release': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkTimeCodeGeneration': '1',
-                },
-              },
-            }
-          },
-        },
       ]},  # 'targets'
     ],  # OS=="win"
     # TODO(jrg): add in Windows code coverage targets.
     ['coverage!=0',
       { 'targets': [
         {
           'target_name': 'coverage',
           # do NOT place this in the 'all' list; most won't want it.
           # In gyp, booleans are 0/1 not True/False.
           'suppress_wildcard': 1,
@@ skipping 38 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: