chrome/browser/media/protected_media_identifier_permission_context.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/media/protected_media_identifier_permission_context.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/media/protected_media_identifier_permission_context.h ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/protected_media_identifier_permission_context.cc

diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc

index ba3b06412aff03fcb5665e5c95d802af5c3d9b1f..b419eb9a1c55820b8d49c2cfdae6a0be37388a1f 100644

--- a/chrome/browser/media/protected_media_identifier_permission_context.cc

+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc

@@ -9,7 +9,6 @@

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

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

#include "chrome/common/pref_names.h"

-#include "components/content_settings/core/common/permission_request_id.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

@@ -139,7 +138,7 @@ void ProtectedMediaIdentifierPermissionContext::CancelPermissionRequest(

#if defined(OS_CHROMEOS)

PendingRequestMap::iterator request = pending_requests_.find(web_contents);

- if (request == pending_requests_.end() || !request->second.second.Equals(id))

+ if (request == pending_requests_.end() || (request->second.second != id))

return;

views::Widget* widget = request->second.first;

@@ -227,7 +226,7 @@ void ProtectedMediaIdentifierPermissionContext::

if (request == pending_requests_.end())

return;

- DCHECK(request->second.second.Equals(id));

+ DCHECK(request->second.second == id);

pending_requests_.erase(request);

ContentSetting content_setting = CONTENT_SETTING_ASK;