chrome/browser/content_settings/permission_queue_controller.cc - Issue 1166603002: Move PermissionRequestID to chrome/browser/permissions/.

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 1166603002: Move PermissionRequestID to chrome/browser/permissions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission_rfh

Patch Set: fix build Created 5 years, 6 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_infobar_delegate.h ('k') | chrome/browser/content_settings/permission_queue_controller_unittest.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 10cf79b7b0e9b3aa10153ae49b6e14499cd5c520..dab4a8a74bc28fcedd0b0fa2278f414ab4e58459 100644

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

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

@@ -181,7 +181,7 @@ void PermissionQueueController::CancelInfoBarRequest(

for (PendingInfobarRequests::iterator i(pending_infobar_requests_.begin());

i != pending_infobar_requests_.end(); ++i) {

- if (!i->id().Equals(id))

+ if (id != i->id())

continue;

InfoBarService* infobar_service = GetInfoBarService(id);

@@ -229,7 +229,7 @@ void PermissionQueueController::OnPermissionSet(

pending_requests_to_remove.push_back(i);

continue;

}

- if (i->id().Equals(id)) {

+ if (id == i->id()) {

// The infobar that called us is i->infobar(), and its delegate is

// currently in either Accept() or Cancel(). This means that

// RemoveInfoBar() will be called later on, and that will trigger a