components/content_settings/core/browser/content_settings_registry.cc - Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android

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/content_settings_registry.cc

Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes

Patch Set: address review comments, minor change Created 4 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 | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_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/content_settings_registry.cc

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

index 98fda540628ec72677f038dd1ec33157c916e09b..240243d1961e0ca1e04543ead37b120323dab534 100644

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

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

@@ -133,8 +133,7 @@ void ContentSettingsRegistry::Init() {

kExtensionScheme),

ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),

WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,

- WebsiteSettingsRegistry::DESKTOP |

- WebsiteSettingsRegistry::PLATFORM_ANDROID,

+ WebsiteSettingsRegistry::DESKTOP,

ContentSettingsInfo::INHERIT_IN_INCOGNITO);

@@ -155,8 +154,7 @@ void ContentSettingsRegistry::Init() {

CONTENT_SETTING_ASK,

CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),

WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,

- WebsiteSettingsRegistry::DESKTOP |

- WebsiteSettingsRegistry::PLATFORM_ANDROID,

+ WebsiteSettingsRegistry::DESKTOP,

ContentSettingsInfo::INHERIT_IN_INCOGNITO);

@@ -205,8 +203,7 @@ void ContentSettingsRegistry::Init() {

ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,

CONTENT_SETTING_ASK),

WebsiteSettingsInfo::TOP_LEVEL_DOMAIN_ONLY_SCOPE,

- WebsiteSettingsRegistry::DESKTOP |

- WebsiteSettingsRegistry::PLATFORM_ANDROID,

+ WebsiteSettingsRegistry::DESKTOP,

ContentSettingsInfo::INHERIT_IN_INCOGNITO);