diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 07:58:57 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 07:58:57 +0000 |
commit | 57c84f44d0a127461c20b4d3354426bfdc02826a (patch) | |
tree | 71812266a53ff643d8324eefbb42fbc40c4d7f49 | |
parent | ddd1844a44696ec660bcbb6d939df0299a03b3a6 (diff) | |
download | chromium_src-57c84f44d0a127461c20b4d3354426bfdc02826a.zip chromium_src-57c84f44d0a127461c20b4d3354426bfdc02826a.tar.gz chromium_src-57c84f44d0a127461c20b4d3354426bfdc02826a.tar.bz2 |
DevTools: remove injected script from resources.
Review URL: http://codereview.chromium.org/3180017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57037 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/renderer/devtools_agent.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/devtools_agent.h | 1 | ||||
-rw-r--r-- | webkit/support/platform_support_win.cc | 1 | ||||
-rw-r--r-- | webkit/support/webkit_support.cc | 10 | ||||
-rw-r--r-- | webkit/support/webkit_support.h | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_devtools_agent.cc | 6 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_devtools_agent.h | 1 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 1 |
8 files changed, 0 insertions, 28 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index a7ea31b..0023678 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -138,12 +138,6 @@ void DevToolsAgent::runtimePropertyChanged( value.utf8())); } -WebCString DevToolsAgent::injectedScriptSource() { - base::StringPiece injectjsWebkit = - webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_WEBKIT_JS); - return WebCString(injectjsWebkit.data(), injectjsWebkit.length()); -} - WebCString DevToolsAgent::debuggerScriptSource() { base::StringPiece debuggerScriptjs = webkit_glue::GetDataResource(IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS); diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 690c040..b93af64 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -49,7 +49,6 @@ class DevToolsAgent : public WebKit::WebDevToolsAgentClient { bool enabled); virtual void runtimePropertyChanged(const WebKit::WebString& name, const WebKit::WebString& value); - virtual WebKit::WebCString injectedScriptSource(); virtual WebKit::WebCString debuggerScriptSource(); virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop* createClientMessageLoop(); diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index 0c776b2..c73d134 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -112,7 +112,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_INJECT_WEBKIT_JS: case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS: return NetResourceProvider(resource_id); diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index fd55d23..8199678 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -471,16 +471,6 @@ WebKit::WebThemeEngine* GetThemeEngine() { #endif // DevTools -WebCString GetDevToolsInjectedScriptSource() { - base::StringPiece injectJSWebkit = webkit_glue::GetDataResource( - IDR_DEVTOOLS_INJECT_WEBKIT_JS); - return WebCString(injectJSWebkit.as_string().c_str()); -} - -WebCString GetDevToolsInjectedScriptDispatcherSource() { - return WebCString(); -} - WebCString GetDevToolsDebuggerScriptSource() { base::StringPiece debuggerScriptJS = webkit_glue::GetDataResource( IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS); diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index a762669..7757d62 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -145,8 +145,6 @@ WebKit::WebThemeEngine* GetThemeEngine(); #endif // - DevTools -WebKit::WebCString GetDevToolsInjectedScriptSource(); -WebKit::WebCString GetDevToolsInjectedScriptDispatcherSource(); WebKit::WebCString GetDevToolsDebuggerScriptSource(); WebKit::WebURL GetDevToolsPathAsURL(); diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc index 4164fad..11a5873 100644 --- a/webkit/tools/test_shell/test_shell_devtools_agent.cc +++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc @@ -86,12 +86,6 @@ void TestShellDevToolsAgent::runtimePropertyChanged( // TODO: Implement. } -WebCString TestShellDevToolsAgent::injectedScriptSource() { - base::StringPiece injectjsWebkit = - webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_WEBKIT_JS); - return WebCString(injectjsWebkit.data(), injectjsWebkit.length()); -} - WebCString TestShellDevToolsAgent::debuggerScriptSource() { base::StringPiece debuggerScriptjs = webkit_glue::GetDataResource(IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS); diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h index 467c863..8ea16de 100644 --- a/webkit/tools/test_shell/test_shell_devtools_agent.h +++ b/webkit/tools/test_shell/test_shell_devtools_agent.h @@ -35,7 +35,6 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient { virtual void forceRepaint(); virtual void runtimePropertyChanged(const WebKit::WebString& name, const WebKit::WebString& value); - virtual WebKit::WebCString injectedScriptSource(); virtual WebKit::WebCString debuggerScriptSource(); virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop* diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 5d6f99f..2bf4ceb 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -789,7 +789,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_INJECT_WEBKIT_JS: case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS: case IDR_INPUT_SPEECH: case IDR_INPUT_SPEECH_RECORDING: |