content/child/web_url_loader_impl.cc - Issue 203853003: Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2)

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/child/web_url_loader_impl.cc

Issue 203853003: Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (attempt #2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style feedback Created 6 years, 9 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

« content/child/request_extra_data.h ('K') | « content/child/resource_dispatcher_unittest.cc ('k') | content/renderer/pepper/url_request_info_util.cc » ('j') | content/renderer/pepper/url_request_info_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/web_url_loader_impl.cc

diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc

index aebe55018f9eda40997d49d0f055a1bcafb2df55..b11a537b8f7dd571434171aefdcc364b0fb37052 100644

--- a/content/child/web_url_loader_impl.cc

+++ b/content/child/web_url_loader_impl.cc

@@ -14,6 +14,7 @@

#include "base/time/time.h"

#include "content/child/child_thread.h"

#include "content/child/ftp_directory_listing_response_delegate.h"

+#include "content/child/request_extra_data.h"

#include "content/child/request_info.h"

#include "content/common/resource_request_body.h"

#include "net/base/data_url.h"

@@ -35,7 +36,6 @@

#include "third_party/WebKit/public/web/WebSecurityPolicy.h"

#include "webkit/child/multipart_response_delegate.h"

#include "webkit/child/resource_loader_bridge.h"

-#include "webkit/child/weburlrequest_extradata_impl.h"

#include "webkit/child/weburlresponse_extradata_impl.h"

using base::Time;