webkit/fileapi/file_system_url_request_job.cc - Issue 10855209: Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument

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: webkit/fileapi/file_system_url_request_job.cc

Issue 10855209: Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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

« chrome/browser/extensions/extension_protocols.cc ('K') | « webkit/fileapi/file_system_url_request_job.h ('k') | webkit/fileapi/file_system_url_request_job_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/fileapi/file_system_url_request_job.cc

diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc

index 72269dbf18b3530346642ff55064c49ad0d18c0a..1d09ed5bd36ac28103aabeea471fb3121dc1fd73 100644

--- a/webkit/fileapi/file_system_url_request_job.cc

+++ b/webkit/fileapi/file_system_url_request_job.cc

@@ -26,12 +26,12 @@

#include "net/http/http_response_info.h"

#include "net/http/http_util.h"

#include "net/url_request/url_request.h"

-#include "net/url_request/url_request_context.h"

#include "webkit/blob/file_stream_reader.h"

#include "webkit/fileapi/file_system_context.h"

#include "webkit/fileapi/file_system_util.h"

#include "webkit/fileapi/local_file_system_operation.h"

+using net::NetworkDelegate;

using net::URLRequest;

using net::URLRequestJob;

using net::URLRequestStatus;

@@ -55,8 +55,10 @@ static net::HttpResponseHeaders* CreateHttpResponseHeaders() {

}

FileSystemURLRequestJob::FileSystemURLRequestJob(

- URLRequest* request, FileSystemContext* file_system_context)

- : URLRequestJob(request, request->context()->network_delegate()),

+ URLRequest* request,

+ NetworkDelegate* network_delegate,

+ FileSystemContext* file_system_context)

+ : URLRequestJob(request, network_delegate),

file_system_context_(file_system_context),

ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),

is_directory_(false),