content/public/browser/resource_dispatcher_host_delegate.h - Issue 1081013002: Revert of Ensuring interception of stream get determined by plugin path before checking mime type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/browser/resource_dispatcher_host_delegate.h

Issue 1081013002: Revert of Ensuring interception of stream get determined by plugin path before checking mime type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/public/browser/resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/resource_dispatcher_host_delegate.h

diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h

index 7ff399434c390c5bbf42f55fa1929734ac35f1dd..7942df568989229cab7c5e389328dff3b864becf 100644

--- a/content/public/browser/resource_dispatcher_host_delegate.h

+++ b/content/public/browser/resource_dispatcher_host_delegate.h

@@ -8,7 +8,6 @@

#include <string>

#include "base/basictypes.h"

-#include "base/files/file_path.h"

#include "base/memory/scoped_ptr.h"

#include "content/common/content_export.h"

#include "content/public/common/resource_type.h"

@@ -93,12 +92,10 @@

// If the stream will be rendered in a BrowserPlugin, |payload| will contain

// the data that should be given to the old ResourceHandler to forward to the

// renderer process.

- virtual bool ShouldInterceptResourceAsStream(

- net::URLRequest* request,

- const base::FilePath& plugin_path,

- const std::string& mime_type,

- GURL* origin,

- std::string* payload);

+ virtual bool ShouldInterceptResourceAsStream(net::URLRequest* request,

+ const std::string& mime_type,

+ GURL* origin,

+ std::string* payload);

// Informs the delegate that a Stream was created. The Stream can be read from

// the blob URL of the Stream, but can only be read once.