Move default plugin resources into separate .h and .rc files

from the other webkit resources.  I'm going to convert
webkit_resources.rc to a cross platform .grd file so I'm moving
the windows specific default plugin code into a separate file.

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

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

7 files changed, 53 insertions, 35 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 3f4f3e2..07cf3ca 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -235,6 +235,10 @@ END
 
 #include "installer_util_strings.rc"
 
+// We include these resources because all ICON types need to be in the
+// same .rc file.  See:
+// http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx
+#include "webkit\\default_plugin\\default_plugin_resources.rc"
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -245,5 +249,3 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-
-
diff --git a/webkit/default_plugin/default_plugin.vcproj b/webkit/default_plugin/default_plugin.vcproj
index f64f00a..b3ee9cf 100644
--- a/webkit/default_plugin/default_plugin.vcproj
+++ b/webkit/default_plugin/default_plugin.vcproj
@@ -134,6 +134,10 @@
 			>
 		</File>
 		<File
+			RelativePath=".\default_plugin_resources.h"
+			>
+		</File>
+		<File
 			RelativePath=".\default_plugin_shared.h"
 			>
 		</File>
diff --git a/webkit/default_plugin/default_plugin_resources.h b/webkit/default_plugin/default_plugin_resources.h
new file mode 100644
index 0000000..6e6942c
--- /dev/null
+++ b/webkit/default_plugin/default_plugin_resources.h
@@ -0,0 +1,13 @@
+// Copyright (c) 2006-2008 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.
+
+#define IDD_DEFAULT_PLUGIN_INSTALL_DIALOG     2208
+#define IDI_DEFAULT_PLUGIN_ICON               2209
+#define IDB_GET_THE_PLUGIN                    2210
+#define IDC_PLUGIN_MAIN_LABEL                 2211
+#define IDC_PLUGIN_INSTALL_LABEL              2212
+#define IDC_PLUGIN_URL_LABEL                  2213
+#define IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL 2214
+#define IDC_PLUGIN_NAME                       2215
+#define IDC_PLUGIN_NAME_VALUE                 2216
diff --git a/webkit/default_plugin/default_plugin_resources.rc b/webkit/default_plugin/default_plugin_resources.rc
new file mode 100644
index 0000000..53460af
--- /dev/null
+++ b/webkit/default_plugin/default_plugin_resources.rc
@@ -0,0 +1,31 @@
+// Resources used by webkit/default_plugin.
+//
+// Paths in this file are relative to SolutionDir.
+
+#ifdef APSTUDIO_INVOKED
+  #error // Don't open in the Visual Studio resource editor!
+#endif //APSTUDIO_INVOKED
+
+#include <winuser.h>
+#include "webkit\\default_plugin\\default_plugin_resources.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog template for the plugin installation dialog.
+//
+IDD_DEFAULT_PLUGIN_INSTALL_DIALOG DIALOGEX 0, 0, 240, 130
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Plug-in Needed"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "",IDB_GET_THE_PLUGIN,32,100,81,14
+    PUSHBUTTON      "",IDCANCEL,133,100,74,14
+    LTEXT           "",IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL,17,50,204,27
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon used by the default plugin window.
+//
+IDI_DEFAULT_PLUGIN_ICON            ICON             "webkit\\default_plugin\\default_plugin.ico"
diff --git a/webkit/default_plugin/install_dialog.h b/webkit/default_plugin/install_dialog.h
index d750b07..9a5f3ca 100644
--- a/webkit/default_plugin/install_dialog.h
+++ b/webkit/default_plugin/install_dialog.h
@@ -9,7 +9,7 @@
 #include <atlwin.h>
 #include <string>
 
-#include "webkit/glue/webkit_resources.h"
+#include "webkit/default_plugin/default_plugin_resources.h"
 
 class PluginInstallerImpl;
 
diff --git a/webkit/glue/webkit_resources.h b/webkit/glue/webkit_resources.h
index 344072b..8662778 100644
--- a/webkit/glue/webkit_resources.h
+++ b/webkit/glue/webkit_resources.h
@@ -29,13 +29,3 @@
 #define IDC_PAN_SOUTH_WEST              2114
 #define IDC_PAN_WEST                    2115
 #define IDC_PAN_NORTH_WEST              2116
-
-#define IDD_DEFAULT_PLUGIN_INSTALL_DIALOG     2208
-#define IDI_DEFAULT_PLUGIN_ICON               2209
-#define IDB_GET_THE_PLUGIN                    2210
-#define IDC_PLUGIN_MAIN_LABEL                 2211
-#define IDC_PLUGIN_INSTALL_LABEL              2212
-#define IDC_PLUGIN_URL_LABEL                  2213
-#define IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL 2214
-#define IDC_PLUGIN_NAME                       2215
-#define IDC_PLUGIN_NAME_VALUE                 2216
diff --git a/webkit/glue/webkit_resources.rc b/webkit/glue/webkit_resources.rc
index e39ee75..c99e5f6 100644
--- a/webkit/glue/webkit_resources.rc
+++ b/webkit/glue/webkit_resources.rc
@@ -24,7 +24,6 @@ IDR_TEXTAREA_RESIZER       BINDATA "webkit\\glue\\resources\\textarea_resize_cor
 //
 // Cursor
 //
-
 IDC_ALIAS               CURSOR    "webkit\\glue\\resources\\aliasb.cur"
 IDC_CELL                CURSOR    "webkit\\glue\\resources\\cell.cur"
 IDC_COLRESIZE           CURSOR    "webkit\\glue\\resources\\col_resize.cur"
@@ -42,24 +41,3 @@ IDC_PAN_SOUTH           CURSOR    "webkit\\glue\\resources\\pan_south.cur"
 IDC_PAN_SOUTH_WEST      CURSOR    "webkit\\glue\\resources\\pan_south_west.cur"
 IDC_PAN_WEST            CURSOR    "webkit\\glue\\resources\\pan_west.cur"
 IDC_PAN_NORTH_WEST      CURSOR    "webkit\\glue\\resources\\pan_north_west.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog template for the plugin installation dialog.
-//
-IDD_DEFAULT_PLUGIN_INSTALL_DIALOG DIALOGEX 0, 0, 240, 130
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Plug-in Needed"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "",IDB_GET_THE_PLUGIN,32,100,81,14
-    PUSHBUTTON      "",IDCANCEL,133,100,74,14
-    LTEXT           "",IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL,17,50,204,27
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon used by the default plugin window.
-//
-IDI_DEFAULT_PLUGIN_ICON            ICON             "webkit\\default_plugin\\default_plugin.ico"