| Index: chrome/common/extensions/api/extension_api.json
|
| diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
|
| index 69163cbacfd12a8ab84a8619e532ad48413326b5..eac39e47603067791b10155c9dc3efef24a5db0d 100644
|
| --- a/chrome/common/extensions/api/extension_api.json
|
| +++ b/chrome/common/extensions/api/extension_api.json
|
| @@ -8223,7 +8223,7 @@
|
| "description": "A human readable description of the resource."
|
| }
|
| },
|
| - "description": "The only content type using resource identifiers is <var>plugins</var>. Using a resource identifier allows an extension to specify content settings applying only to a specific plug-in. If no rule for the specific plug-in is found, the rules without resource identifiers are applied."
|
| + "description": "The only content type using resource identifiers is <a href=\"contentSettings.html#property-plugins\"><var>plugins</var></a>. For more information, see <a href=\"contentSettings.html#resource-identifiers\">Resource Identifiers</a>."
|
| },
|
| {
|
| "id": "ContentSetting",
|
| @@ -8313,11 +8313,11 @@
|
| "properties": {
|
| "primaryPattern": {
|
| "type": "string",
|
| - "description": "The pattern for the primary URL. For details on the format of a pattern, see <a href='match_patterns.html'>Match Patterns</a>."
|
| + "description": "The pattern for the primary URL. For details on the format of a pattern, see <a href='contentSettings.html#patterns'>Content Setting Patterns</a>."
|
| },
|
| "secondaryPattern": {
|
| "type": "string",
|
| - "description": "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>.",
|
| + "description": "The pattern for the secondary URL. Defaults to matching all URLs. For details on the format of a pattern, see <a href='contentSettings.html#patterns'>Content Setting Patterns</a>.",
|
| "optional": true
|
| },
|
| "resourceIdentifier": {
|
| @@ -8372,7 +8372,7 @@
|
| "properties": {
|
| "cookies": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to allow cookies and other local data to be set by websites. One of<br><var>allow</var>: Accept cookies,<br><var>block</var>: Block cookies,<br><var>session_only</var>: Accept cookies only for the current session. Default is <var>allow</var>.<br>The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.",
|
| + "description": "Whether to allow cookies and other local data to be set by websites. One of<br><var>allow</var>: Accept cookies,<br><var>block</var>: Block cookies,<br><var>session_only</var>: Accept cookies only for the current session. <br>Default is <var>allow</var>.<br>The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.",
|
| "value": [
|
| "cookies",
|
| {"type":"string", "enum": ["allow", "block", "session_only"]}
|
| @@ -8380,7 +8380,7 @@
|
| },
|
| "images": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to show images. One of<br><var>allow</var>: Show images,<br><var>block</var>: Don't show images. Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| + "description": "Whether to show images. One of<br><var>allow</var>: Show images,<br><var>block</var>: Don't show images. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| "value": [
|
| "images",
|
| {"type":"string", "enum": ["allow", "block"]}
|
| @@ -8388,7 +8388,7 @@
|
| },
|
| "javascript": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to run Javascript. One of<br><var>allow</var>: Run Javascript,<br><var>block</var>: Don't run Javascript. Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| + "description": "Whether to run JavaScript. One of<br><var>allow</var>: Run JavaScript,<br><var>block</var>: Don't run JavaScript. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| "value": [
|
| "javascript",
|
| {"type":"string", "enum": ["allow", "block"]}
|
| @@ -8396,7 +8396,7 @@
|
| },
|
| "plugins": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to run plug-ins. One of<br><var>allow</var>: Run plug-ins automatically,<br><var>block</var>: Don't run plug-ins automatically. Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| + "description": "Whether to run plug-ins. One of<br><var>allow</var>: Run plug-ins automatically,<br><var>block</var>: Don't run plug-ins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| "value": [
|
| "plugins",
|
| {"type":"string", "enum": ["allow", "block"]}
|
| @@ -8404,7 +8404,7 @@
|
| },
|
| "popups": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to allow sites to show pop-ups. One of<br><var>allow</var>: Allow sites to show pop-ups,<br><var>block</var>: Don't allow sites to show pop-ups. Default is <var>block</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| + "description": "Whether to allow sites to show pop-ups. One of<br><var>allow</var>: Allow sites to show pop-ups,<br><var>block</var>: Don't allow sites to show pop-ups. <br>Default is <var>block</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| "value": [
|
| "popups",
|
| {"type":"string", "enum": ["allow", "block"]}
|
| @@ -8412,7 +8412,7 @@
|
| },
|
| "notifications": {
|
| "$ref": "ContentSetting",
|
| - "description": "Whether to allow sites to show desktop notifications. One of<br><var>allow</var>: Allow sites to show desktop notifications,<br><var>block</var>: Don't allow sites to show desktop notifications,<br><var>ask</var>: Ask when a site wants to show desktop notifications. Default is <var>ask</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| + "description": "Whether to allow sites to show desktop notifications. One of<br><var>allow</var>: Allow sites to show desktop notifications,<br><var>block</var>: Don't allow sites to show desktop notifications,<br><var>ask</var>: Ask when a site wants to show desktop notifications. <br>Default is <var>ask</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",
|
| "value": [
|
| "notifications",
|
| {"type":"string", "enum": ["allow", "block", "ask"]}
|
|
|