diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 18:05:26 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 18:05:26 +0000 |
| commit | 620161e8a6feabda90783efa40b1dec2d08754a5 (patch) | |
| tree | 4b657db4f0163b5f997d266e9a0f871b3d9ffe97 /webkit | |
| parent | 34ebb250424e57b08876129ed8adf35b20b471c2 (diff) | |
| download | chromium_src-620161e8a6feabda90783efa40b1dec2d08754a5.zip chromium_src-620161e8a6feabda90783efa40b1dec2d08754a5.tar.gz chromium_src-620161e8a6feabda90783efa40b1dec2d08754a5.tar.bz2 | |
Move ResourceDispatcher to content. I've moved the Chrome-specific SecurityFilterPeer to renderer directory, and factored out its creation so that it's the same as how we create ExtensionLocalizationPeer.
Review URL: http://codereview.chromium.org/6626046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 8 | ||||
| -rw-r--r-- | webkit/support/webkit_support_glue.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 7 |
3 files changed, 0 insertions, 22 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 8e318c3..d2cdd5f 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -20,7 +20,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" #include "ui/base/clipboard/clipboard.h" -#include "webkit/glue/resource_loader_bridge.h" class GURL; class SkBitmap; @@ -282,13 +281,6 @@ void EnableSpdy(bool enable); // Notifies the browser that the given action has been performed. void UserMetricsRecordAction(const std::string& action); -// Allows the embedder to swap the peer for a request through the resource -// loader. Return NULL to keep the existing peer. -webkit_glue::ResourceLoaderBridge::Peer* ReplacePeer( - webkit_glue::ResourceLoaderBridge::Peer* current_peer, - const std::string& mime_type, - const GURL& url); - #if !defined(DISABLE_NACL) // Launch NaCl's sel_ldr process. bool LaunchSelLdr(const char* alleged_url, int socket_count, void* imc_handles, diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc index 40e46f1..562b989 100644 --- a/webkit/support/webkit_support_glue.cc +++ b/webkit/support/webkit_support_glue.cc @@ -99,13 +99,6 @@ void EnableSpdy(bool enable) { void UserMetricsRecordAction(const std::string& action) { } -webkit_glue::ResourceLoaderBridge::Peer* ReplacePeer( - webkit_glue::ResourceLoaderBridge::Peer* current_peer, - const std::string& mime_type, - const GURL& url) { - return NULL; -} - #if defined(OS_LINUX) int MatchFontWithFallback(const std::string& face, bool bold, bool italic, int charset) { diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 31f9e68..f106c35 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -690,13 +690,6 @@ void EnableSpdy(bool enable) { void UserMetricsRecordAction(const std::string& action) { } -webkit_glue::ResourceLoaderBridge::Peer* ReplacePeer( - webkit_glue::ResourceLoaderBridge::Peer* current_peer, - const std::string& mime_type, - const GURL& url) { - return NULL; -} - std::string GetProductVersion() { return std::string("Chrome/0.0.0.0"); } |