diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 20:17:39 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 20:17:39 +0000 |
commit | cbe89c9bfb51c1bf577584d32df5d8b7a3c83159 (patch) | |
tree | 354e107d246dab86da1aca3f79ef11a9b318ea9e /webkit/tools | |
parent | 59c4dd56e427e29eb26e81512c3066fe3f8b13b8 (diff) | |
download | chromium_src-cbe89c9bfb51c1bf577584d32df5d8b7a3c83159.zip chromium_src-cbe89c9bfb51c1bf577584d32df5d8b7a3c83159.tar.gz chromium_src-cbe89c9bfb51c1bf577584d32df5d8b7a3c83159.tar.bz2 |
Get rid of the extension dependency in ResourceDispatcher by calling out to a webkit_glue function that can update the peer. No point sending the boolean flag from the browser since the same check is done in the renderer.
Review URL: http://codereview.chromium.org/6628006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 7 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate_gtk.cc | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index f106c35..31f9e68 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -690,6 +690,13 @@ 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"); } diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index 38e64cb..42372f3 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -24,7 +24,6 @@ #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" -#include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" #include "webkit/plugins/npapi/gtk_plugin_container_manager.h" #include "webkit/plugins/npapi/plugin_list.h" |