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

7 files changed, 23 insertions, 32 deletions

diff --git a/chrome/browser/debugger/debugger.vcproj b/chrome/browser/debugger/debugger.vcproj
index 2ef5241..d72b86a 100644
--- a/chrome/browser/debugger/debugger.vcproj
+++ b/chrome/browser/debugger/debugger.vcproj
@@ -190,10 +190,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\resources\debugger_resources.h"
-			>
-		</File>
-		<File
 			RelativePath=".\debugger_view.cc"
 			>
 		</File>
diff --git a/chrome/browser/debugger/debugger_contents.cc b/chrome/browser/debugger/debugger_contents.cc
index f861168..1c426f8 100644
--- a/chrome/browser/debugger/debugger_contents.cc
+++ b/chrome/browser/debugger/debugger_contents.cc
@@ -11,12 +11,13 @@
 #include "chrome/browser/debugger/debugger_contents.h"
 #include "chrome/browser/debugger/debugger_shell.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/debugger/resources/debugger_resources.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/resource_bundle.h"
 #include "net/base/mime_util.h"
 
+#include "grit/debugger_resources.h"
+
 class DebuggerHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   // Creates our datasource and sets our user message to a specific message
diff --git a/chrome/browser/debugger/debugger_shell.cc b/chrome/browser/debugger/debugger_shell.cc
index 64b4887..ec7d6c4 100644
--- a/chrome/browser/debugger/debugger_shell.cc
+++ b/chrome/browser/debugger/debugger_shell.cc
@@ -15,11 +15,12 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/debugger_io.h"
 #include "chrome/browser/debugger/debugger_node.h"
-#include "chrome/browser/debugger/resources/debugger_resources.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/resource_bundle.h"
 
+#include "grit/debugger_resources.h"
+
 #if defined(OS_WIN)
 #include "chrome/browser/tab_contents/tab_contents.h"
 #elif defined(OS_POSIX)
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc
index 18a8104..25ee191 100644
--- a/chrome/browser/debugger/debugger_view.cc
+++ b/chrome/browser/debugger/debugger_view.cc
@@ -10,7 +10,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/debugger/resources/debugger_resources.h"
 #include "chrome/browser/debugger/debugger_shell.h"
 #include "chrome/browser/debugger/debugger_view.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
@@ -29,6 +28,7 @@
 #include "chrome/views/text_field.h"
 #include "chrome/views/view.h"
 
+#include "grit/debugger_resources.h"
 
 DebuggerView::DebuggerView() : output_ready_(false) {
   web_container_ = new TabContentsContainerView();
diff --git a/chrome/browser/debugger/resources/debugger_resources.grd b/chrome/browser/debugger/resources/debugger_resources.grd
new file mode 100755
index 0000000..37bf7a3
--- /dev/null
+++ b/chrome/browser/debugger/resources/debugger_resources.grd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="debugger_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="debugger_resources.rc" type="rc_all" />
+    <output filename="debugger_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_DEBUGGER_SHELL_JS" file="debugger_shell.js" type="BINDATA" />
+      <include name="IDR_DEBUGGER_HTML" file="debugger.html" type="BINDATA" />
+      <include name="IDR_DEBUGGER_CSS" file="debugger.css" type="BINDATA" />
+      <include name="IDR_DEBUGGER_JS" file="debugger.js" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
\ No newline at end of file
diff --git a/chrome/browser/debugger/resources/debugger_resources.h b/chrome/browser/debugger/resources/debugger_resources.h
deleted file mode 100644
index 0dbf643..0000000
--- a/chrome/browser/debugger/resources/debugger_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_DEBUGGER_SHELL_JS          600
-#define IDR_DEBUGGER_HTML              601
-#define IDR_DEBUGGER_CSS               602
-#define IDR_DEBUGGER_JS                603
diff --git a/chrome/browser/debugger/resources/debugger_resources.rc b/chrome/browser/debugger/resources/debugger_resources.rc
deleted file mode 100644
index 13c2e87..0000000
--- a/chrome/browser/debugger/resources/debugger_resources.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Resources used by browser/debugger/*.

-//

-// 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 "browser\\debugger\\resources\\debugger_resources.h"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// data resources

-//

-

-IDR_DEBUGGER_SHELL_JS        BINDATA   "browser\\debugger\\resources\\debugger_shell.js"

-IDR_DEBUGGER_HTML            BINDATA   "browser\\debugger\\resources\\debugger.html"

-IDR_DEBUGGER_CSS             BINDATA   "browser\\debugger\\resources\\debugger.css"

-IDR_DEBUGGER_JS              BINDATA   "browser\\debugger\\resources\\debugger.js"