chrome/renderer/security_filter_peer.cc - Issue 226273005: Remove webkit's ResourceLoaderBridge interface.

Unified Diff: chrome/renderer/security_filter_peer.cc

Issue 226273005: Remove webkit's ResourceLoaderBridge interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASED Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/renderer/security_filter_peer.cc

diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc

index 5f795f82789dc84636841d70ee59fcaea91188fe..b6356543da1b8d95dbab20f5eb7c19526b3636a5 100644

--- a/chrome/renderer/security_filter_peer.cc

+++ b/chrome/renderer/security_filter_peer.cc

@@ -11,12 +11,8 @@

#include "net/http/http_response_headers.h"

#include "ui/base/l10n/l10n_util.h"

-SecurityFilterPeer::SecurityFilterPeer(

- webkit_glue::ResourceLoaderBridge* resource_loader_bridge,

- content::RequestPeer* peer)

- : original_peer_(peer),

- resource_loader_bridge_(resource_loader_bridge) {

+SecurityFilterPeer::SecurityFilterPeer(content::RequestPeer* peer)

+ : original_peer_(peer) {}

SecurityFilterPeer::~SecurityFilterPeer() {

}

@@ -46,7 +42,7 @@ SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(

if (ResourceType::IsFrame(resource_type))

return CreateSecurityFilterPeerForFrame(peer, os_error);

// Any other content is entirely filtered-out.

- return new ReplaceContentPeer(NULL, peer, std::string(), std::string());

+ return new ReplaceContentPeer(peer, std::string(), std::string());

default:

// For other errors, we use our normal error handling.

return NULL;

@@ -64,7 +60,7 @@ SecurityFilterPeer* SecurityFilterPeer::CreateSecurityFilterPeerForFrame(

"<body style='background-color:#990000;color:white;'>"

"%s</body></html>",

l10n_util::GetStringUTF8(IDS_UNSAFE_FRAME_MESSAGE).c_str());

- return new ReplaceContentPeer(NULL, peer, "text/html", html);

+ return new ReplaceContentPeer(peer, "text/html", html);

}

void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) {

@@ -133,13 +129,9 @@ void ProcessResponseInfo(

////////////////////////////////////////////////////////////////////////////////

// BufferedPeer

-BufferedPeer::BufferedPeer(

- webkit_glue::ResourceLoaderBridge* resource_loader_bridge,

- content::RequestPeer* peer,

- const std::string& mime_type)

- : SecurityFilterPeer(resource_loader_bridge, peer),

- mime_type_(mime_type) {

+BufferedPeer::BufferedPeer(content::RequestPeer* peer,

+ const std::string& mime_type)

+ : SecurityFilterPeer(peer), mime_type_(mime_type) {}

BufferedPeer::~BufferedPeer() {

}

@@ -188,15 +180,12 @@ void BufferedPeer::OnCompletedRequest(int error_code,

////////////////////////////////////////////////////////////////////////////////

// ReplaceContentPeer

-ReplaceContentPeer::ReplaceContentPeer(

- webkit_glue::ResourceLoaderBridge* resource_loader_bridge,

- content::RequestPeer* peer,

- const std::string& mime_type,

- const std::string& data)

- : SecurityFilterPeer(resource_loader_bridge, peer),

+ReplaceContentPeer::ReplaceContentPeer(content::RequestPeer* peer,

+ const std::string& mime_type,

+ const std::string& data)

+ : SecurityFilterPeer(peer),

mime_type_(mime_type),

- data_(data) {

+ data_(data) {}

ReplaceContentPeer::~ReplaceContentPeer() {

}

« no previous file with comments | « chrome/renderer/security_filter_peer.h ('k') | content/child/blink_platform_impl.h » ('j') | no next file with comments »