chrome/common/chrome_content_client.cc - Issue 1192013003: [Extension ServiceWorkers] Allow service worker registration

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 1192013003: [Extension ServiceWorkers] Allow service worker registration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Took out extra reload Created 5 years, 5 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 unified diff | Download patch

« chrome/browser/extensions/service_worker_apitest.cc ('K') | « chrome/common/chrome_content_client.h ('k') | chrome/common/secure_origin_whitelist_unittest.cc » ('j') | chrome/test/data/extensions/api_test/service_worker/fetch/manifest.json » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/common/chrome_content_client.h"	5 #include "chrome/common/chrome_content_client.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/debug/crash_logging.h"	8 #include "base/debug/crash_logging.h"

9 #include "base/files/file_util.h"	9 #include "base/files/file_util.h"

10 #include "base/json/json_reader.h"	10 #include "base/json/json_reader.h"

(...skipping 567 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
578 #endif	578 #endif

579	579

580 void ChromeContentClient::AddSecureSchemesAndOrigins(	580 void ChromeContentClient::AddSecureSchemesAndOrigins(

581 std::set<std::string>* schemes,	581 std::set<std::string>* schemes,

582 std::set<GURL>* origins) {	582 std::set<GURL>* origins) {

583 schemes->insert(content::kChromeUIScheme);	583 schemes->insert(content::kChromeUIScheme);

584 schemes->insert(extensions::kExtensionScheme);	584 schemes->insert(extensions::kExtensionScheme);

585 schemes->insert(extensions::kExtensionResourceScheme);	585 schemes->insert(extensions::kExtensionResourceScheme);

586 GetSecureOriginWhitelist(origins);	586 GetSecureOriginWhitelist(origins);

587 }	587 }

	588

	589 void ChromeContentClient::AddServiceWorkerSchemes(

	590 std::set<std::string>* schemes) {

	591 schemes->insert(extensions::kExtensionScheme);

	592 }

OLD	NEW