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, 27 deletions

diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj
index 00282224..283ab6e 100644
--- a/chrome/common/common.vcproj
+++ b/chrome/common/common.vcproj
@@ -434,10 +434,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\common_resources.h"
-			>
-		</File>
-		<File
 			RelativePath=".\debug_flags.cc"
 			>
 		</File>
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
new file mode 100755
index 0000000..07ccf1d
--- /dev/null
+++ b/chrome/common/common_resources.grd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="common_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="common_resources.rc" type="rc_all" />
+    <output filename="common_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_JSTEMPLATE_JS" file="..\third_party\jstemplate\jstemplate_compiled.js" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
\ No newline at end of file
diff --git a/chrome/common/common_resources.h b/chrome/common/common_resources.h
deleted file mode 100644
index 9ec89db..0000000
--- a/chrome/common/common_resources.h
+++ /dev/null
@@ -1,3 +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_JSTEMPLATE_JS              300
diff --git a/chrome/common/common_resources.rc b/chrome/common/common_resources.rc
deleted file mode 100644
index 0a8690b..0000000
--- a/chrome/common/common_resources.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Resources used by common/*.
-//
-// 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 "common\\common_resources.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// data resources
-//
-
-IDR_JSTEMPLATE_JS      BINDATA       "third_party\\jstemplate\\jstemplate_compiled.js"
diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc
index 8bba0b7..49772db 100644
--- a/chrome/common/jstemplate_builder.cc
+++ b/chrome/common/jstemplate_builder.cc
@@ -7,11 +7,12 @@
 
 #include "chrome/common/jstemplate_builder.h"
 
-#include "chrome/common/common_resources.h"
-#include "chrome/common/json_value_serializer.h"
 #include "base/logging.h"
-#include "chrome/common/resource_bundle.h"
 #include "base/string_util.h"
+#include "chrome/common/json_value_serializer.h"
+#include "chrome/common/resource_bundle.h"
+
+#include "grit/common_resources.h"
 
 namespace jstemplate_builder {
 
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index e984bc4..94adb8e 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -11,13 +11,14 @@
 #include "net/http/http_response_headers.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/renderer/renderer_resources.h"
 #include "generated_resources.h"
 #include "skia/include/SkBitmap.h"
 #include "skia/include/SkCanvas.h"
 #include "webkit/glue/webkit_glue.h"
 #include "SkDevice.h"
 
+#include "grit/renderer_resources.h"
+
 SecurityFilterPeer::SecurityFilterPeer(
     webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
     webkit_glue::ResourceLoaderBridge::Peer* peer)