content/browser/service_worker/service_worker_controllee_request_handler.h - Issue 637243003: Service Worker: Obey content settings when deciding to control a page

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/service_worker/service_worker_controllee_request_handler.h

Issue 637243003: Service Worker: Obey content settings when deciding to control a page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@content

Patch Set: consistent fmt 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 | « content/browser/service_worker/service_worker_context_request_handler_unittest.cc ('k') | content/browser/service_worker/service_worker_controllee_request_handler.cc » ('j') | content/browser/service_worker/service_worker_controllee_request_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_controllee_request_handler.h

diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.h b/content/browser/service_worker/service_worker_controllee_request_handler.h

index 60143a9e14981bc0e51708e4d5dd04b217903a3d..b1ac4fb3a3cbe74f5f6dbedc70209cdaa2d4b55e 100644

--- a/content/browser/service_worker/service_worker_controllee_request_handler.h

+++ b/content/browser/service_worker/service_worker_controllee_request_handler.h

@@ -44,7 +44,8 @@ class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler

// Called via custom URLRequestJobFactory.

virtual net::URLRequestJob* MaybeCreateJob(

net::URLRequest* request,

- net::NetworkDelegate* network_delegate) OVERRIDE;

+ net::NetworkDelegate* network_delegate,

+ ResourceContext* resource_context) OVERRIDE;

virtual void GetExtraResponseInfo(

bool* was_fetched_via_service_worker,

@@ -78,6 +79,7 @@ class CONTENT_EXPORT ServiceWorkerControlleeRequestHandler

RequestContextType request_context_type_;

RequestContextFrameType frame_type_;

scoped_refptr<ResourceRequestBody> body_;

+ ResourceContext* resource_context_;

base::WeakPtrFactory<ServiceWorkerControlleeRequestHandler> weak_factory_;

DISALLOW_COPY_AND_ASSIGN(ServiceWorkerControlleeRequestHandler);