Commit 6c9e3b3d authored by msramek's avatar msramek Committed by Commit bot

Replace the term "main-frame" in content_settings.json.

Following the discussion about the term "main-frame" in https://codereview.chromium.org/843413003/, I experimented with a testing webpage that embedded <iframe>s which triggered different content setting requests.

Apparently, in the descriptions in content_settings.json, we used the term "main-frame" in two different contexts. This CL get rids of the term completely in favor of "top-level frame" and "document which requests X".

BUG=447978

Review URL: https://codereview.chromium.org/883983003

Cr-Commit-Position: refs/heads/master@{#313889}
parent d07e66d8
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
}, },
"images": { "images": {
"$ref": "ContentSetting", "$ref": "ContentSetting",
"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 the URL of the image.", "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 URL of the top-level frame. The secondary URL is the URL of the image.",
"value": [ "value": [
"images", "images",
{"type":"string", "enum": ["allow", "block"]} {"type":"string", "enum": ["allow", "block"]}
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
}, },
"javascript": { "javascript": {
"$ref": "ContentSetting", "$ref": "ContentSetting",
"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.", "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 URL of the top-level frame. The secondary URL is not used.",
"value": [ "value": [
"javascript", "javascript",
{"type":"string", "enum": ["allow", "block"]} {"type":"string", "enum": ["allow", "block"]}
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
}, },
"plugins": { "plugins": {
"$ref": "ContentSetting", "$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. <br>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 URL of the top-level frame. The secondary URL is not used.",
"value": [ "value": [
"plugins", "plugins",
{"type":"string", "enum": ["allow", "block"]} {"type":"string", "enum": ["allow", "block"]}
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
}, },
"popups": { "popups": {
"$ref": "ContentSetting", "$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. <br>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 URL of the top-level frame. The secondary URL is not used.",
"value": [ "value": [
"popups", "popups",
{"type":"string", "enum": ["allow", "block"]} {"type":"string", "enum": ["allow", "block"]}
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
}, },
"notifications": { "notifications": {
"$ref": "ContentSetting", "$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. <br>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 URL of the document which wants to show the notification. The secondary URL is not used.",
"value": [ "value": [
"notifications", "notifications",
{"type":"string", "enum": ["allow", "block", "ask"]} {"type":"string", "enum": ["allow", "block", "ask"]}
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
}, },
"mouselock": { "mouselock": {
"$ref": "ContentSetting", "$ref": "ContentSetting",
"description": "Whether to allow sites to disable the mouse cursor. One of <br><var>allow</var>: Allow sites to disable the mouse cursor,<br><var>block</var>: Don't allow sites to disable the mouse cursor,<br><var>ask</var>: Ask when a site wants to disable the mouse cursor. <br>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 disable the mouse cursor. One of <br><var>allow</var>: Allow sites to disable the mouse cursor,<br><var>block</var>: Don't allow sites to disable the mouse cursor,<br><var>ask</var>: Ask when a site wants to disable the mouse cursor. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
"value": [ "value": [
"mouselock", "mouselock",
{"type":"string", "enum": ["allow", "block", "ask"]} {"type":"string", "enum": ["allow", "block", "ask"]}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment