components/content_settings/core/browser/website_settings_registry.cc - Issue 2075103002: Change ContentSettingsType's scoping type and hookup migration code

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: components/content_settings/core/browser/website_settings_registry.cc

Issue 2075103002: Change ContentSettingsType's scoping type and hookup migration code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@do_migration_after_sync

Patch Set: revise test Created 4 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

« no previous file with comments | « components/content_settings/core/browser/website_settings_info.h ('k') | components/content_settings/core/browser/website_settings_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/website_settings_registry.cc

diff --git a/components/content_settings/core/browser/website_settings_registry.cc b/components/content_settings/core/browser/website_settings_registry.cc

index 553a0c72dd4f6203f4a0e8ef5d7ea004af185b5b..0bbdebaa90080af2b472699b17322370ad8c1ef4 100644

--- a/components/content_settings/core/browser/website_settings_registry.cc

+++ b/components/content_settings/core/browser/website_settings_registry.cc

@@ -116,7 +116,7 @@ void WebsiteSettingsRegistry::Init() {

"auto-select-certificate", nullptr, WebsiteSettingsInfo::UNSYNCABLE,

WebsiteSettingsInfo::NOT_LOSSY,

- WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE, ALL_PLATFORMS,

+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, ALL_PLATFORMS,

WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

"ssl-cert-decisions", nullptr, WebsiteSettingsInfo::UNSYNCABLE,

@@ -126,7 +126,7 @@ void WebsiteSettingsRegistry::Init() {

WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);

WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::LOSSY,

- WebsiteSettingsInfo::REQUESTING_DOMAIN_ONLY_SCOPE,

+ WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,

DESKTOP | PLATFORM_ANDROID,

WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);