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

Unified Diff: chrome/common/extensions/docs/experimental.contentSettings.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/popup.html ('k') | chrome/common/extensions/docs/samples.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/experimental.contentSettings.html

diff --git a/chrome/common/extensions/docs/experimental.contentSettings.html b/chrome/common/extensions/docs/experimental.contentSettings.html

index fcb153b1279e897a48b5c93475a0f1346ff4779d..b58ea1c8df2406033a9ff85b04b282280990eee4 100644

--- a/chrome/common/extensions/docs/experimental.contentSettings.html

+++ b/chrome/common/extensions/docs/experimental.contentSettings.html

@@ -654,7 +654,7 @@

Undocumented.

</dd>

- <dd>Whether to allow cookies and other local data to be set by websites. One of <var>allow</var>: Accept cookies, <var>block</var>: Block cookies, <var>session_only</var>: Accept cookies only for the current session. Default is <var>allow</var>.</dd>

+ <dd>Whether to allow cookies and other local data to be set by websites. One of <var>allow</var>: Accept cookies, <var>block</var>: Block cookies, <var>session_only</var>: Accept cookies only for the current session. Default is <var>allow</var>. The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.</dd>

This parameter was added in version

.

@@ -728,7 +728,7 @@

Undocumented.

</dd>

- <dd>Whether to show images. One of <var>allow</var>: Show images, <var>block</var>: Don't show images. Default is <var>allow</var>.</dd>

+ <dd>Whether to show images. One of <var>allow</var>: Show images, <var>block</var>: Don't show images. Default is <var>allow</var>. The primary URL is the main-frame URL. The secondary URL is not used.</dd>

This parameter was added in version

.

@@ -802,7 +802,7 @@

Undocumented.

</dd>

- <dd>Whether to run Javascript. One of <var>allow</var>: Run Javascript, <var>block</var>: Don't run Javascript. Default is <var>allow</var>.</dd>

+ <dd>Whether to run Javascript. One of <var>allow</var>: Run Javascript, <var>block</var>: Don't run Javascript. Default is <var>allow</var>. The primary URL is the main-frame URL. The secondary URL is not used.</dd>

This parameter was added in version

.

@@ -876,7 +876,7 @@

Undocumented.

</dd>

- <dd>Whether to run plug-ins. One of <var>allow</var>: Run plug-ins automatically, <var>block</var>: Don't run plug-ins automatically. Default is <var>allow</var>.</dd>

+ <dd>Whether to run plug-ins. One of <var>allow</var>: Run plug-ins automatically, <var>block</var>: Don't run plug-ins automatically. Default is <var>allow</var>. The primary URL is the main-frame URL. The secondary URL is not used.</dd>

This parameter was added in version

.

@@ -950,7 +950,7 @@

Undocumented.

</dd>

- <dd>Whether to allow sites to show pop-ups. One of <var>allow</var>: Allow sites to show pop-ups, <var>block</var>: Don't allow sites to show pop-ups. Default is <var>block</var>.</dd>

+ <dd>Whether to allow sites to show pop-ups. One of <var>allow</var>: Allow sites to show pop-ups, <var>block</var>: Don't allow sites to show pop-ups. Default is <var>block</var>. The primary URL is the main-frame URL. The secondary URL is not used.</dd>

This parameter was added in version

.

@@ -1024,7 +1024,7 @@

Undocumented.

</dd>

- <dd>Whether to allow sites to show desktop notifications. One of <var>allow</var>: Allow sites to show desktop notifications, <var>block</var>: Don't allow sites to show desktop notifications, <var>ask</var>: Ask when a site wants to show desktop notifications. Default is <var>ask</var>.</dd>

+ <dd>Whether to allow sites to show desktop notifications. One of <var>allow</var>: Allow sites to show desktop notifications, <var>block</var>: Don't allow sites to show desktop notifications, <var>ask</var>: Ask when a site wants to show desktop notifications. Default is <var>ask</var>. The primary URL is the main-frame URL. The secondary URL is not used.</dd>

This parameter was added in version

.

@@ -2149,7 +2149,7 @@

<div>

<dt>

- <var>embeddedUrl</var>

+ <var>primaryUrl</var>

@@ -2177,7 +2177,7 @@

Undocumented.

</dd>

- <dd>The URL of the frame or object for which the content settings should be retrieved.</dd>

+ <dd>The primary URL for which the content setting should be retrieved. Note that the meaning of a primary URL depends on the content type.</dd>

This parameter was added in version

.

@@ -2217,13 +2217,13 @@

</div><div>

<div>

<dt>

- <var>topLevelUrl</var>

+ <var>secondaryUrl</var>

(

- optional

+ optional

enumerated

@@ -2245,7 +2245,7 @@

Undocumented.

</dd>

- <dd>The URL of the top-level frame.</dd>

+ <dd>The secondary URL for which the content setting should be retrieved. Defaults to the primary URL. Note that the meaning of a secondary URL depends on the content type, and not all content types use secondary URLs.</dd>

This parameter was added in version

.

@@ -2961,7 +2961,7 @@

<div>

<dt>

- <var>topLevelPattern</var>

+ <var>primaryPattern</var>

@@ -2989,7 +2989,7 @@

Undocumented.

</dd>

- <dd>The pattern for the top-level frame URL. For details on the format of a pattern, see <a href="match_patterns.html">Match Patterns</a>.</dd>

+ <dd>The pattern for the primary URL. For details on the format of a pattern, see <a href="match_patterns.html">Match Patterns</a>.</dd>

This parameter was added in version

.

@@ -3029,13 +3029,13 @@

</div><div>

<div>

<dt>

- <var>embeddedPattern</var>

+ <var>secondaryPattern</var>

(

- optional

+ optional

enumerated

@@ -3057,7 +3057,7 @@

Undocumented.

</dd>

- <dd>The pattern for the frame or object URL. For details on the format of a pattern, see <a href="match_patterns.html">Match Patterns</a>.</dd>

+ <dd>The pattern for the secondary URL. Defaults to matching all URLs. For details on the format of a pattern, see <a href="match_patterns.html">Match Patterns</a>.</dd>

This parameter was added in version

.