chrome/common/extensions/docs/examples/api/contentSettings/popup.html - Issue 7229012: Use extension match pattern syntax in 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 7229012: Use extension match pattern syntax in content settings extension API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: initialize port 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') | chrome/common/extensions/url_pattern.h » ('J')
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 eebb9c48e4925a6b084418285466e9fce04babf9..d83e1d16f92b79dea5109b76206dc56cec890a45 100644

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

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

@@ -2,16 +2,6 @@

<html>

<head>

-var settings = {

- "cookies": ["allow", "session_only", "block"],

- "images": ["allow", "block"],

- "javascript": ["allow", "block"],

- "plugins": ["allow", "block"],

- "popups": ["allow", "block"],

- // "location": ["allow", "ask", "block"],

- "notifications": ["allow", "ask", "block"],

-};

var incognito;

var url;

@@ -37,9 +27,7 @@ function init() {

function settingChanged(element) {

var type = element.id;

var setting = element.value;

- var pattern = {

- 'pattern': url

- };

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

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

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

'topLevelPattern': pattern,

@@ -73,7 +61,6 @@ function settingChanged(element) {

<option value="allow">Allow</option>

- <option value="ask">Click-to-play</option>

<option value="block">Block</option>

</select></dd>