chrome/browser/ui/website_settings/website_settings.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/ui/website_settings/website_settings.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 | « chrome/browser/push_messaging/push_messaging_service_unittest.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 5853d3e4094cda5b3bf438ef21ed1433af29b61d..4b217458d38486155852fb2521130bc525de18dc 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -101,9 +101,6 @@ ContentSettingsType kPermissionType[] = {

CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

-#if defined(OS_ANDROID)

- CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

-#endif

CONTENT_SETTINGS_TYPE_JAVASCRIPT,

#if !defined(OS_ANDROID)

CONTENT_SETTINGS_TYPE_PLUGINS,