chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc - Issue 625993002: Split up streams logic to prepare for PlzNavigate RDH changes.

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: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 625993002: Split up streams logic to prepare for PlzNavigate RDH changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: --similarity Created 6 years, 2 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 | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h ('k') | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | content/browser/loader/stream_writer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

index 0863976386bf431323f5792f059b139d5fbcec38..88e6de79f0757ac77a035ba15220b4a71864d52d 100644

--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -43,7 +43,7 @@

#include "content/public/browser/resource_context.h"

#include "content/public/browser/resource_dispatcher_host.h"

#include "content/public/browser/resource_request_info.h"

-#include "content/public/browser/stream_handle.h"

+#include "content/public/browser/stream_info.h"

#include "content/public/browser/web_contents.h"

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

#include "net/base/load_flags.h"

@@ -167,7 +167,7 @@ void UpdatePrerenderNetworkBytesCallback(int render_process_id,

}

#if defined(ENABLE_EXTENSIONS)

-void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamHandle> stream,

+void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamInfo> stream,

int64 expected_content_size,

int render_process_id,

int render_view_id,

@@ -615,7 +615,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(

void ChromeResourceDispatcherHostDelegate::OnStreamCreated(

net::URLRequest* request,

- scoped_ptr<content::StreamHandle> stream) {

+ scoped_ptr<content::StreamInfo> stream) {

#if defined(ENABLE_EXTENSIONS)

const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);

std::map<net::URLRequest*, StreamTargetInfo>::iterator ix =