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

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

Issue 1164073006: Make the logic for stream interception by MimeHandlerViews consistent with starting the plugin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 397d1324606aea35aeeb754d71358a4ccac61e63..c9a1e4612d8fdb388209a47253a1032293929c58 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -718,19 +718,18 @@ ResourceDispatcherHostImpl::CreateResourceHandlerForDownload(
return handler.Pass();
}
-scoped_ptr<ResourceHandler>
-ResourceDispatcherHostImpl::MaybeInterceptAsStream(net::URLRequest* request,
- ResourceResponse* response,
- std::string* payload) {
+scoped_ptr<ResourceHandler> ResourceDispatcherHostImpl::MaybeInterceptAsStream(
+ const base::FilePath& plugin_path,
+ net::URLRequest* request,
+ ResourceResponse* response,
+ std::string* payload) {
mmenke 2015/07/09 20:35:39 Suggest payload->clear() here. Makes for a cleare
raymes 2015/07/17 03:21:00 Done.
ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
const std::string& mime_type = response->head.mime_type;
GURL origin;
if (!delegate_ ||
- !delegate_->ShouldInterceptResourceAsStream(request,
- mime_type,
- &origin,
- payload)) {
+ !delegate_->ShouldInterceptResourceAsStream(
+ request, plugin_path, mime_type, &origin, payload)) {
return scoped_ptr<ResourceHandler>();
}

Powered by Google App Engine
This is Rietveld 408576698