summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 16:32:01 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-23 16:32:01 +0000
commitaae311bffb73ec52148ad71f01b8888416c0a17c (patch)
treeef33160a316139c78887d1f9cddfa7037a20aa10
parent1660bffd6b65401778e0657c1fcd658d06097409 (diff)
downloadchromium_src-aae311bffb73ec52148ad71f01b8888416c0a17c.zip
chromium_src-aae311bffb73ec52148ad71f01b8888416c0a17c.tar.gz
chromium_src-aae311bffb73ec52148ad71f01b8888416c0a17c.tar.bz2
DevTools: remove references to IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS
Now that DebuggerScript.js is compiled into DebuggerScriptSource.h we don't need to add it to the resource bundle. BUG= TEST= Review URL: http://codereview.chromium.org/6727020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79133 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/devtools_agent.cc8
-rw-r--r--chrome/renderer/devtools_agent.h1
-rw-r--r--webkit/support/webkit_support.cc6
-rw-r--r--webkit/support/webkit_support.h1
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.cc6
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.h1
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc1
7 files changed, 0 insertions, 24 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 9c0471f5..71e5864 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -13,12 +13,10 @@
#include "chrome/renderer/devtools_agent_filter.h"
#include "content/common/view_messages.h"
#include "content/renderer/render_view.h"
-#include "grit/webkit_chromium_resources.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/webkit_glue.h"
using WebKit::WebDevToolsAgent;
using WebKit::WebDevToolsAgentClient;
@@ -121,12 +119,6 @@ void DevToolsAgent::runtimePropertyChanged(
value.utf8()));
}
-WebCString DevToolsAgent::debuggerScriptSource() {
- base::StringPiece debuggerScriptjs =
- webkit_glue::GetDataResource(IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS);
- return WebCString(debuggerScriptjs.data(), debuggerScriptjs.length());
-}
-
WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
DevToolsAgent::createClientMessageLoop() {
return new WebKitClientMessageLoopImpl();
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index 8f268c5..ce455b3 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -51,7 +51,6 @@ class DevToolsAgent : public RenderViewObserver,
bool enabled);
virtual void runtimePropertyChanged(const WebKit::WebString& name,
const WebKit::WebString& value);
- virtual WebKit::WebCString debuggerScriptSource();
virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
createClientMessageLoop();
virtual bool exposeV8DebuggerProtocol();
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 89c39cc..cbbba16 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -552,12 +552,6 @@ WebKit::WebThemeEngine* GetThemeEngine() {
#endif
// DevTools
-WebCString GetDevToolsDebuggerScriptSource() {
- base::StringPiece debuggerScriptJS = webkit_glue::GetDataResource(
- IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS);
- return WebCString(debuggerScriptJS.as_string().c_str());
-}
-
WebURL GetDevToolsPathAsURL() {
FilePath dirExe;
if (!webkit_glue::GetExeDirectory(&dirExe)) {
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index a3711da..fb158f4 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -171,7 +171,6 @@ WebKit::WebThemeEngine* GetThemeEngine();
#endif
// - DevTools
-WebKit::WebCString GetDevToolsDebuggerScriptSource();
WebKit::WebURL GetDevToolsPathAsURL();
// - FileSystem
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 7dcb9dc..0f81e7d 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -84,12 +84,6 @@ void TestShellDevToolsAgent::runtimePropertyChanged(
// TODO: Implement.
}
-WebCString TestShellDevToolsAgent::debuggerScriptSource() {
- base::StringPiece debuggerScriptjs =
- webkit_glue::GetDataResource(IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS);
- return WebCString(debuggerScriptjs.data(), debuggerScriptjs.length());
-}
-
WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
TestShellDevToolsAgent::createClientMessageLoop() {
return new WebKitClientMessageLoopImpl();
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index 274f950..457adfd 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -33,7 +33,6 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
virtual int hostIdentifier();
virtual void runtimePropertyChanged(const WebKit::WebString& name,
const WebKit::WebString& value);
- virtual WebKit::WebCString debuggerScriptSource();
virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
createClientMessageLoop();
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 185b1736..a6ef8fe 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -720,7 +720,6 @@ base::StringPiece GetDataResource(int resource_id) {
case IDR_MEDIA_SOUND_DISABLED:
case IDR_MEDIA_SLIDER_THUMB:
case IDR_MEDIA_VOLUME_SLIDER_THUMB:
- case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS:
case IDR_INPUT_SPEECH:
case IDR_INPUT_SPEECH_RECORDING:
case IDR_INPUT_SPEECH_WAITING: