Move webkit_resources.rc to webkit_resources.grd. Add

webkit_resources.vcproj which creates the .rc files and have webkit
glue depend on it.

I had to add a flag to grit that allows a resource to be in the
header, but not in the .rc file.  We do this for a test_shell only
resource that is not compiled in.

SCons build also works on windows.

I still need to update the other .sln files and mac build.

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

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

6 files changed, 49 insertions, 77 deletions

diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index fe18543..48d2485 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -47,10 +47,12 @@
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_impl.h"
-#include "webkit/glue/webkit_resources.h"
 #include "webkit/glue/webview_impl.h"
 #include "webkit/glue/webview_delegate.h"
 
+// Generated by GRIT
+#include "webkit_resources.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
 #include <vssym32.h>
diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc
index f7ad688..5d6962b 100644
--- a/webkit/glue/feed_preview.cc
+++ b/webkit/glue/feed_preview.cc
@@ -19,7 +19,9 @@ MSVC_POP_WARNING();
 #include "base/logging.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkit_resources.h"
+
+// Generated by GRIT
+#include "webkit_resources.h"
 
 namespace WebCore {
 
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index b529e06..a31b75d 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -12,7 +12,9 @@
 #include "base/pickle.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/webcursor.h"
-#include "webkit/glue/webkit_resources.h"
+
+// Generated by GRIT
+#include "webkit_resources.h"
 
 using WebCore::PlatformCursor;
 
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
new file mode 100755
index 0000000..79c64f9c
--- /dev/null
+++ b/webkit/glue/webkit_resources.grd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<grit latest_public_release="0" current_release="1">

+  <outputs>

+    <output filename="webkit_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="webkit_resources.rc" type="rc_all" />
+  </outputs>

+  <release seq="1">

+    <includes>

+      <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" />

+      <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />

+      <include name="IDR_FEED_PREVIEW" file="resources\feed.html" type="BINDATA" />

+      <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />

+      <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />

+

+      <!-- The editor delete button is only used in layout tests so the

+           actual resource isn't in webkit_resources.rc.  This resource

+           should not be used outside of layout tests. -->

+      <include name="IDR_EDITOR_DELETE_BUTTON" headeronly="true" file="" type="BINDATA" />

+      <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />

+      <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />

+      <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />

+      <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />

+      <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />

+      <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" />

+      <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" />

+      <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" />

+      <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />

+      <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />

+      <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />

+      <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />

+      <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />

+      <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />

+      <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />

+      <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />

+      <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />

+    </includes>

+  </release>

+</grit>
\ No newline at end of file
diff --git a/webkit/glue/webkit_resources.h b/webkit/glue/webkit_resources.h
deleted file mode 100644
index 8662778..0000000
--- a/webkit/glue/webkit_resources.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// These values shouldn't clash with other values defined in .rc files.
-// TODO(tc): Come up with a way to automate the generation of these
-// IDs so they don't collide with other rc files.
-#define IDR_BROKENIMAGE                 2000
-#define IDR_TICKMARK_DASH               2001
-#define IDR_FEED_PREVIEW                2002
-#define IDR_PAN_SCROLL_ICON             2003
-#define IDR_TEXTAREA_RESIZER            2004
-
-// The editor delete button is only used in layout tests so the actual
-// resource isn't in webkit_resources.rc.  This resource should not be
-// used outside of layout tests.
-#define IDR_EDITOR_DELETE_BUTTON        2005
-
-#define IDC_ALIAS                       2100
-#define IDC_CELL                        2101
-#define IDC_COLRESIZE                   2102
-#define IDC_COPYCUR                     2103
-#define IDC_ROWRESIZE                   2104
-#define IDC_VERTICALTEXT                2105
-#define IDC_ZOOMIN                      2106
-#define IDC_ZOOMOUT                     2107
-#define IDC_PAN_MIDDLE                  2108
-#define IDC_PAN_NORTH                   2109
-#define IDC_PAN_NORTH_EAST              2110
-#define IDC_PAN_EAST                    2111
-#define IDC_PAN_SOUTH_EAST              2112
-#define IDC_PAN_SOUTH                   2113
-#define IDC_PAN_SOUTH_WEST              2114
-#define IDC_PAN_WEST                    2115
-#define IDC_PAN_NORTH_WEST              2116
diff --git a/webkit/glue/webkit_resources.rc b/webkit/glue/webkit_resources.rc
deleted file mode 100644
index c99e5f6..0000000
--- a/webkit/glue/webkit_resources.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Resources used by webkit/*.
-//
-// 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\\glue\\webkit_resources.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// data resources
-//
-
-IDR_BROKENIMAGE            BINDATA "webkit\\glue\\resources\\broken-image.gif"
-IDR_TICKMARK_DASH          BINDATA "webkit\\glue\\resources\\dash.png"
-IDR_FEED_PREVIEW           BINDATA "webkit\\glue\\resources\\feed.html"
-IDR_PAN_SCROLL_ICON        BINDATA "webkit\\glue\\resources\\pan_icon.png"
-IDR_TEXTAREA_RESIZER       BINDATA "webkit\\glue\\resources\\textarea_resize_corner.png"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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"
-IDC_COPYCUR             CURSOR    "webkit\\glue\\resources\\copy.cur"
-IDC_ROWRESIZE           CURSOR    "webkit\\glue\\resources\\row_resize.cur"
-IDC_VERTICALTEXT        CURSOR    "webkit\\glue\\resources\\vertical_text.cur"
-IDC_ZOOMIN              CURSOR    "webkit\\glue\\resources\\zoom_in.cur"
-IDC_ZOOMOUT             CURSOR    "webkit\\glue\\resources\\zoom_out.cur"
-IDC_PAN_MIDDLE          CURSOR    "webkit\\glue\\resources\\pan_middle.cur"
-IDC_PAN_NORTH           CURSOR    "webkit\\glue\\resources\\pan_north.cur"
-IDC_PAN_NORTH_EAST      CURSOR    "webkit\\glue\\resources\\pan_north_east.cur"
-IDC_PAN_EAST            CURSOR    "webkit\\glue\\resources\\pan_east.cur"
-IDC_PAN_SOUTH_EAST      CURSOR    "webkit\\glue\\resources\\pan_south_east.cur"
-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"