content/browser/loader/resource_loader.cc - Issue 15476003: Move TransferNavigationResourceThrottle into CrossSiteResourceHandler.

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/browser/loader/resource_loader.cc

Issue 15476003: Move TransferNavigationResourceThrottle into CrossSiteResourceHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove null check on cross_site_handler(). Created 7 years, 3 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:

Index: content/browser/loader/resource_loader.cc

diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc

index c99fe5b0d7cd36eb1f45ac2464bdc287ffef3b73..8f70ab5482b1ec240a6cf4a31d233b32abc83a24 100644

--- a/content/browser/loader/resource_loader.cc

+++ b/content/browser/loader/resource_loader.cc

@@ -9,6 +9,7 @@

#include "base/metrics/histogram.h"

#include "base/time/time.h"

#include "content/browser/child_process_security_policy_impl.h"

+#include "content/browser/loader/cross_site_resource_handler.h"

#include "content/browser/loader/resource_loader_delegate.h"

#include "content/browser/loader/resource_request_info_impl.h"

#include "content/browser/ssl/ssl_client_auth_handler.h"

@@ -165,10 +166,10 @@ void ResourceLoader::MarkAsTransferring(const GURL& target_url) {

}

void ResourceLoader::CompleteTransfer() {

- DCHECK_EQ(DEFERRED_REDIRECT, deferred_stage_);

+ DCHECK_EQ(DEFERRED_READ, deferred_stage_);

is_transferring_ = false;

- Resume();

+ GetRequestInfo()->cross_site_handler()->ResumeResponse();

}

ResourceRequestInfoImpl* ResourceLoader::GetRequestInfo() {