Port remaining .rc data resource files to grd. This includes

debugger_resources.rc, common_resources.rc, and renderer_resources.rc.

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

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

6 files changed, 21 insertions, 31 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index b8bd897..bbe14c4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -27,7 +27,6 @@
 #include "chrome/renderer/debug_message_handler.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/renderer_resources.h"
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webmediaplayer_delegate_impl.h"
@@ -57,6 +56,7 @@
 #include "webkit/glue/webview.h"
 
 #include "generated_resources.h"
+#include "grit/renderer_resources.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
diff --git a/chrome/renderer/renderer.vcproj b/chrome/renderer/renderer.vcproj
index 289fc28..7e50f8f 100644
--- a/chrome/renderer/renderer.vcproj
+++ b/chrome/renderer/renderer.vcproj
@@ -310,10 +310,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\renderer_resources.h"
-			>
-		</File>
-		<File
 			RelativePath=".\user_script_slave.cc"
 			>
 		</File>
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
new file mode 100755
index 0000000..30b7d65
--- /dev/null
+++ b/chrome/renderer/renderer_resources.grd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="renderer_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="renderer_resources.rc" type="rc_all" />
+    <output filename="renderer_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_NET_ERROR_HTML" file="resources\neterror.html" type="BINDATA" />
+      <include name="IDR_INSECURE_CONTENT_STAMP" file="resources\insecure_content_stamp.png" type="BINDATA" />
+      <include name="IDR_ERROR_NO_DETAILS_HTML" file="resources\error_no_details.html" type="BINDATA" />
+      <include name="IDR_GREASEMONKEY_API_JS" file="resources\greasemonkey_api.js" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
\ No newline at end of file
diff --git a/chrome/renderer/renderer_resources.h b/chrome/renderer/renderer_resources.h
deleted file mode 100644
index 06bff27..0000000
--- a/chrome/renderer/renderer_resources.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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_NET_ERROR_HTML             500
-#define IDR_INSECURE_CONTENT_STAMP     501
-#define IDR_ERROR_NO_DETAILS_HTML      502
-#define IDR_GREASEMONKEY_API_JS        503
diff --git a/chrome/renderer/renderer_resources.rc b/chrome/renderer/renderer_resources.rc
deleted file mode 100644
index 13cbe75..0000000
--- a/chrome/renderer/renderer_resources.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Resources used by renderer/*.
-//
-// 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 "renderer\\renderer_resources.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// data resources
-//
-
-IDR_NET_ERROR_HTML       BINDATA       "renderer\\resources\\neterror.html"
-IDR_INSECURE_CONTENT_STAMP BINDATA     "renderer\\resources\\insecure_content_stamp.png"
-IDR_ERROR_NO_DETAILS_HTML  BINDATA     "renderer\\resources\\error_no_details.html"
-IDR_GREASEMONKEY_API_JS    BINDATA     "renderer\\resources\\greasemonkey_api.js"
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc
index 0e64a17..8fc1e3a 100644
--- a/chrome/renderer/user_script_slave.cc
+++ b/chrome/renderer/user_script_slave.cc
@@ -8,10 +8,11 @@
 #include "base/pickle.h"
 #include "base/shared_memory.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/renderer/renderer_resources.h" 
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webframe.h"
 
+#include "grit/renderer_resources.h" 
+
 // These two strings are injected before and after the Greasemonkey API and
 // user script to wrap it in an anonymous scope.
 static const char kUserScriptHead[] = "(function (unsafeWindow) {\n";