chrome/browser/permissions/permission_queue_controller.cc - Issue 2250053002: Clean up the PermissionInfoBarDelegate hierarchy.

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_queue_controller.cc

Issue 2250053002: Clean up the PermissionInfoBarDelegate hierarchy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobar-remember-decision

Patch Set: Address comments Created 4 years, 4 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/permissions/permission_infobar_delegate.cc ('K') | « chrome/browser/permissions/permission_infobar_delegate.cc ('k') | chrome/browser/permissions/permission_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_queue_controller.cc

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

index caa45c101fcca4d2dad1af5cac51f553a9c36c0d..4825cca9d1e9e4cd243ed95a44248941fe7f22b4 100644

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

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

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

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

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

#include "chrome/browser/notifications/notification_permission_infobar_delegate.h"

+#include "chrome/browser/permissions/permission_infobar_delegate.h"

#include "chrome/browser/permissions/permission_request.h"

#include "chrome/browser/permissions/permission_request_id.h"

#include "chrome/browser/permissions/permission_uma_util.h"

@@ -119,7 +120,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(

// is tied to that of the queue controller. Before QueueController

// is destroyed, all requests will be cancelled and so all delegates

// will be destroyed.

- PermissionInfobarDelegate::PermissionSetCallback callback = base::Bind(

+ PermissionInfoBarDelegate::PermissionSetCallback callback = base::Bind(

&PermissionQueueController::OnPermissionSet, base::Unretained(controller),

id_, requesting_frame_, embedder_, user_gesture_);

switch (type_) {

@@ -130,7 +131,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(

break;

#if defined(ENABLE_NOTIFICATIONS)

case content::PermissionType::NOTIFICATIONS:

- infobar_ = NotificationPermissionInfobarDelegate::Create(

+ infobar_ = NotificationPermissionInfoBarDelegate::Create(

GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,

callback);

break;