chrome/browser/content_settings/permission_context_base.cc - Issue 376253005: Migrate the notification permission to the new common permission classes.

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/content_settings/permission_context_base.cc

Issue 376253005: Migrate the notification permission to the new common permission classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« chrome/browser/content_settings/permission_bubble_request_impl.cc ('K') | « chrome/browser/content_settings/permission_bubble_request_impl.cc ('k') | chrome/browser/content_settings/permission_queue_controller.cc » ('j') | chrome/browser/notifications/desktop_notification_infobar_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_context_base.cc

diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc

index 42c484ed67980e52d504d14d508bab31d5ba1b2c..401604935980b1ec87616dfd2df9ca99bf9f8d0f 100644

--- a/chrome/browser/content_settings/permission_context_base.cc

+++ b/chrome/browser/content_settings/permission_context_base.cc

@@ -27,6 +27,7 @@ enum PermissionType {

PERMISSION_UNKNOWN = 0,

PERMISSION_MIDI_SYSEX = 1,

PERMISSION_PUSH_MESSAGING = 2,

+ PERMISSION_NOTIFICATIONS = 3,

// Always keep this at the end.

PERMISSION_NUM,

@@ -41,6 +42,8 @@ PermissionType SettingToPermission(ContentSettingsType permission) {

return PERMISSION_MIDI_SYSEX;

case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:

return PERMISSION_PUSH_MESSAGING;

+ case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

+ return PERMISSION_NOTIFICATIONS;

default:

NOTREACHED() << "PERMISSION " << permission << " not accounted for";

}