content/browser/service_worker/service_worker_context_request_handler.cc - 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_context_request_handler.cc

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: explicit, and better log 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.h ('k') | content/browser/service_worker/service_worker_context_request_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_request_handler.cc

diff --git a/content/browser/service_worker/service_worker_context_request_handler.cc b/content/browser/service_worker/service_worker_context_request_handler.cc

index 93bacd263cc9ce2ac5fd3526124114835cc1055d..26ad9f4312b6e4361dfdae39331773202250bb6b 100644

--- a/content/browser/service_worker/service_worker_context_request_handler.cc

+++ b/content/browser/service_worker/service_worker_context_request_handler.cc

@@ -11,6 +11,7 @@

#include "content/browser/service_worker/service_worker_storage.h"

#include "content/browser/service_worker/service_worker_version.h"

#include "content/browser/service_worker/service_worker_write_to_cache_job.h"

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

#include "net/base/load_flags.h"

#include "net/url_request/url_request.h"

@@ -34,7 +35,8 @@ ServiceWorkerContextRequestHandler::~ServiceWorkerContextRequestHandler() {

net::URLRequestJob* ServiceWorkerContextRequestHandler::MaybeCreateJob(

net::URLRequest* request,

- net::NetworkDelegate* network_delegate) {

+ net::NetworkDelegate* network_delegate,

+ ResourceContext* resource_context) {

if (!provider_host_ || !version_.get() || !context_)

return NULL;