chrome/browser/content_settings/permission_queue_controller.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_queue_controller.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: rebase 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

« no previous file with comments | « chrome/browser/content_settings/permission_context_uma_util.cc ('k') | chrome/browser/extensions/notifications_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_queue_controller.cc

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

index dd3de069fdaa76a0366280b21d7d206810142879..bd97b776b13eb31516d6fc2d3ac2866d8d326d96 100644

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

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

@@ -11,6 +11,7 @@

#include "chrome/browser/geolocation/geolocation_infobar_delegate.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/media/midi_permission_infobar_delegate.h"

+#include "chrome/browser/notifications/desktop_notification_infobar_delegate.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h"

#include "chrome/browser/tab_contents/tab_util.h"

@@ -112,6 +113,13 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(

GetInfoBarService(id_), controller, id_, requesting_frame_,

display_languages, accept_button_label_);

break;

+#if defined(ENABLE_NOTIFICATIONS)

+ case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

+ infobar_ = DesktopNotificationInfoBarDelegate::Create(

+ GetInfoBarService(id_), controller, id_, requesting_frame_,

+ display_languages);

+ break;

+#endif // ENABLE_NOTIFICATIONS

case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:

infobar_ = MidiPermissionInfoBarDelegate::Create(

GetInfoBarService(id_), controller, id_, requesting_frame_,