chrome/common/extensions/api/content_settings.json - Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo

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/api/content_settings.json

Issue 1252073002: Move pref names and default value into WebsiteSettingsInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@website-settings-registry-simple

Patch Set: Created 5 years, 5 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

« chrome/browser/prefs/pref_model_associator.cc ('K') | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/content_settings.json

diff --git a/chrome/common/extensions/api/content_settings.json b/chrome/common/extensions/api/content_settings.json

index 0500c328a84fd12cc656c022958759b593ac060d..2b90f79a0a6338fd546d229aa597316be3cece86 100644

--- a/chrome/common/extensions/api/content_settings.json

+++ b/chrome/common/extensions/api/content_settings.json

@@ -316,7 +316,7 @@

"$ref": "ContentSetting",

"description": "Whether to allow sites to download multiple files automatically. One of <var>allow</var>: Allow sites to download multiple files automatically, <var>block</var>: Don't allow sites to download multiple files automatically, <var>ask</var>: Ask when a site wants to download files automatically after the first file. Default is <var>ask</var>. The primary URL is the URL of the top-level frame. The secondary URL is not used.",

"value": [

- "multiple-automatic-downloads",

+ "automatic-downloads",

{"$ref":"MultipleAutomaticDownloadsContentSetting"}

]

}