chromecast/browser/cast_permission_manager.h - Issue 1342833002: permissions: handle request ids for permissions in permission manager

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: chromecast/browser/cast_permission_manager.h

Issue 1342833002: permissions: handle request ids for permissions in permission manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test failures Created 5 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

« chrome/browser/permissions/permission_manager.cc ('K') | « chrome/browser/push_messaging/push_messaging_service_impl.cc ('k') | chromecast/browser/cast_permission_manager.cc » ('j') | chromecast/browser/cast_permission_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/browser/cast_permission_manager.h

diff --git a/chromecast/browser/cast_permission_manager.h b/chromecast/browser/cast_permission_manager.h

index 237eff99306cbfae47104e4bfee32ba0a356e779..cb84c6a70ea690cba27406e10c1d468b44f3cb06 100644

--- a/chromecast/browser/cast_permission_manager.h

+++ b/chromecast/browser/cast_permission_manager.h

@@ -18,17 +18,13 @@ class CastPermissionManager : public content::PermissionManager {

~CastPermissionManager() override;

// content::PermissionManager implementation:

- void RequestPermission(

+ int RequestPermission(

content::PermissionType permission,

content::RenderFrameHost* render_frame_host,

- int request_id,

const GURL& requesting_origin,

bool user_gesture,

const base::Callback<void(content::PermissionStatus)>& callback) override;

- void CancelPermissionRequest(content::PermissionType permission,

- content::RenderFrameHost* render_frame_host,

- int request_id,

- const GURL& requesting_origin) override;

+ void CancelPermissionRequest(int request_id) override;

void ResetPermission(content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;