content/shell/browser/shell_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: content/shell/browser/shell_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 compile 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

« content/public/browser/permission_manager.h ('K') | « content/shell/browser/layout_test/layout_test_permission_manager.cc ('k') | content/shell/browser/shell_permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_permission_manager.h

diff --git a/content/shell/browser/shell_permission_manager.h b/content/shell/browser/shell_permission_manager.h

index 96a8e2c477ede1741b3a171a0fe5c5420872961b..3ac649577fa9217e506c8d31c5b7a0e7d935ccd1 100644

--- a/content/shell/browser/shell_permission_manager.h

+++ b/content/shell/browser/shell_permission_manager.h

@@ -17,17 +17,14 @@ class ShellPermissionManager : public PermissionManager {

~ShellPermissionManager() override;

// PermissionManager implementation.

- void RequestPermission(

+ int RequestPermission(

PermissionType permission,

RenderFrameHost* render_frame_host,

- int request_id,

const GURL& requesting_origin,

bool user_gesture,

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

- void CancelPermissionRequest(PermissionType permission,

- RenderFrameHost* render_frame_host,

- int request_id,

- const GURL& requesting_origin) override;

+ void CancelPermissionRequest(RenderFrameHost* render_frame_host,

+ int request_id) override;

void ResetPermission(PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;