Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Unified Diff: content/browser/loader/resource_loader.cc

Issue 1970693002: Use mojo for Chrome Loading, Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 8cca67676d7562fcad4efefa1890c6979ca0274d..6a1293feb55bb97def4d891ba05eedbe4ef7afbb 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -150,11 +150,15 @@ void PopulateResourceResponse(ResourceRequestInfoImpl* info,
ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
std::unique_ptr<ResourceHandler> handler,
CertStore* cert_store,
+ std::unique_ptr<mojom::URLLoader> mojo_loader,
+ mojom::URLLoaderClientPtr mojo_loader_client,
ResourceLoaderDelegate* delegate)
: deferred_stage_(DEFERRED_NONE),
request_(std::move(request)),
handler_(std::move(handler)),
delegate_(delegate),
+ mojo_loader_(std::move(mojo_loader)),
+ mojo_loader_client_(std::move(mojo_loader_client)),
is_transferring_(false),
times_cancelled_before_request_start_(0),
started_request_(false),
@@ -165,6 +169,17 @@ ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
handler_->SetController(this);
}
+ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request,
+ std::unique_ptr<ResourceHandler> handler,
+ CertStore* cert_store,
+ ResourceLoaderDelegate* delegate)
+ : ResourceLoader(std::move(request),
+ std::move(handler),
+ cert_store,
+ nullptr,
+ nullptr,
+ delegate) {}
+
ResourceLoader::~ResourceLoader() {
if (login_delegate_.get())
login_delegate_->OnRequestCancelled();

Powered by Google App Engine
This is Rietveld 408576698