chrome/common/extensions/docs/examples/api/contentSettings/popup.html - Issue 7253041: Use primary/secondary for URLs and patterns everywhere in the content settings extension API.

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: chrome/common/extensions/docs/examples/api/contentSettings/popup.html

Issue 7253041: Use primary/secondary for URLs and patterns everywhere in the content settings extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 6 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 | « chrome/common/extensions/docs/examples/api/contentSettings.zip ('k') | chrome/common/extensions/docs/experimental.contentSettings.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/examples/api/contentSettings/popup.html

diff --git a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html

index d83e1d16f92b79dea5109b76206dc56cec890a45..4d8541af0487ab5f639a7a3ed90ae636ea2b4742 100644

--- a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html

+++ b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html

@@ -13,8 +13,7 @@ function init() {

"notifications"];

types.forEach(function(type) {

chrome.experimental.contentSettings[type].get({

- 'topLevelUrl': url,

- 'embeddedUrl': url,

+ 'primaryUrl': url,

'incognito': incognito

function(details) {

@@ -30,8 +29,7 @@ function settingChanged(element) {

var pattern = /^file:/.test(url) ? url : url.replace(/\/[^\/]*?$/, '/*');

console.log(type+" setting for "+pattern+": "+setting);

chrome.experimental.contentSettings[type].set({

- 'topLevelPattern': pattern,

- 'embeddedPattern': pattern,

+ 'primaryPattern': pattern,

'setting': setting,

'scope': (incognito ? 'incognito_session_only' : 'regular')

});