chrome/browser/permissions/permission_util.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: chrome/browser/permissions/permission_util.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: 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 | « chrome/browser/permissions/permission_manager_unittest.cc ('k') | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | components/content_settings/core/common/content_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_util.cc

diff --git a/chrome/browser/permissions/permission_util.cc b/chrome/browser/permissions/permission_util.cc

index 78271a2c5f2565088a25de0df504fb1a62f93719..bffb3cbb59aadc6250c2c6289233308ce1d43ca9 100644

--- a/chrome/browser/permissions/permission_util.cc

+++ b/chrome/browser/permissions/permission_util.cc

@@ -58,8 +58,6 @@ bool PermissionUtil::GetPermissionType(ContentSettingsType type,

*out = PermissionType::NOTIFICATIONS;

} else if (type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {

*out = PermissionType::MIDI_SYSEX;

- } else if (type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {

- *out = PermissionType::PUSH_MESSAGING;

} else if (type == CONTENT_SETTINGS_TYPE_DURABLE_STORAGE) {

*out = PermissionType::DURABLE_STORAGE;

} else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {