components/content_settings/core/browser/content_settings_registry.cc - Issue 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING

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 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-push-content-setting-2

Patch Set: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING 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/content_settings_default_provider.cc ('k') | components/content_settings/core/common/content_settings.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 240243d1961e0ca1e04543ead37b120323dab534..efc96ca31571272b48b054a94115429bbaff522d 100644

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

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

@@ -255,16 +255,6 @@ void ContentSettingsRegistry::Init() {

WebsiteSettingsRegistry::PLATFORM_ANDROID,

ContentSettingsInfo::INHERIT_IN_INCOGNITO);

- Register(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, "push-messaging",

- CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,

- WhitelistedSchemes(),

- ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,

- CONTENT_SETTING_ASK),

- WebsiteSettingsInfo::REQUESTING_ORIGIN_AND_TOP_LEVEL_ORIGIN_SCOPE,

- WebsiteSettingsRegistry::DESKTOP |

- WebsiteSettingsRegistry::PLATFORM_ANDROID,

- ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW);

"protected-media-identifier", CONTENT_SETTING_ASK,

WebsiteSettingsInfo::UNSYNCABLE, WhitelistedSchemes(),