Convert chrome.dll to the gyp-generated build.

Restore all the resources that were in the previous build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119214

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

2 files changed, 13 insertions, 253 deletions

diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
deleted file mode 100644
index 094962e..0000000
--- a/chrome/app/chrome_dll.vcproj
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="chrome_dll"
-	ProjectGUID="{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}"
-	RootNamespace="chrome_dll"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath="..\tools\build\win\version.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\chrome_dll.vsprops;..\installer\util\using_util.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="Version"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				RuntimeLibrary="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
-				OutputFile="$(IntDir)\chrome.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmtd.lib"
-				ImportLibrary="$(OutDir)\lib\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="call $(SolutionDir)\tools\build\win\hardlink_failsafe.bat &quot;$(TargetPath)&quot; &quot;$(OutDir)\$(TargetFileName)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\chrome_dll.vsprops;..\installer\util\using_util.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="Version"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
-				OutputFile="$(OutDir)\chrome.dll"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				ImportLibrary="$(OutDir)\lib\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(SolutionDir)\app\chrome.dll.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="check_dependents.bat $(TargetPath) chrome.dll.deps"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="resources"
-			>
-			<File
-				RelativePath="..\..\webkit\glue\resources\aliasb.cur"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\browser_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\cell.cur"
-				>
-			</File>
-			<File
-				RelativePath=".\check_dependents.bat"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome.dll.deps"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome_dll.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome_dll_resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome_dll_version.rc.version"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\col_resize.cur"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\common_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\copy.cur"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\debugger_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\net\net_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\renderer_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\row_resize.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\vertical_text.cur"
-				>
-			</File>
-			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\zoom_in.cur"
-				>
-			</File>
-			<File
-				RelativePath="..\..\webkit\glue\resources\zoom_out.cur"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\chrome_dll_main.cc"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9de7a5c..1a8c61e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3667,7 +3667,6 @@
           'type': 'shared_library',
           'product_name': 'chrome',
           'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9',
-          'msvs_existing_vcproj': 'app/chrome_dll.vcproj',
           'include_dirs': [
             'third_party/wtl/include',
           ],
@@ -3743,6 +3742,19 @@
             '../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)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_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',