chrome/browser/media/protected_media_identifier_permission_context.cc - Issue 571483002: Refactor content client to include a single Request/CancelPermission method.

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 571483002: Refactor content client to include a single Request/CancelPermission method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@geoloc_permission

Patch Set: Created 6 years, 3 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') | content/browser/geolocation/geolocation_dispatcher_host.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 fc228ea163f9e5fb6bb739dbe4bd166a573b666d..18392b31e6188e3b1b91f51326c9acdde9f5d83e 100644

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

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

@@ -48,20 +48,13 @@ void ProtectedMediaIdentifierPermissionContext::

RequestProtectedMediaIdentifierPermission(

content::WebContents* web_contents,

const GURL& origin,

- base::Callback<void(bool)> result_callback,

- base::Closure* cancel_callback) {

+ base::Callback<void(bool)> result_callback) {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

if (shutting_down_)

return;

int render_process_id = web_contents->GetRenderProcessHost()->GetID();

int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();

- if (cancel_callback) {

- *cancel_callback = base::Bind(

- &ProtectedMediaIdentifierPermissionContext::

- CancelProtectedMediaIdentifierPermissionRequests,

- this, render_process_id, render_view_id, origin);

- }

const PermissionRequestID id(

render_process_id, render_view_id, 0, origin);