content/browser/permissions/permission_service_impl.h - Issue 1316863010: browser: implement multiple permission requesting

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/browser/permissions/permission_service_impl.h

Issue 1316863010: browser: implement multiple permission requesting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request-multiple-content

Patch Set: Rebase on master Created 5 years, 2 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 | « content/browser/permissions/permission_service_context.cc ('k') | content/browser/permissions/permission_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/permissions/permission_service_impl.h

diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h

index 26321870d3d7bcd6d210410a76496d5245f4742a..5d5351193fa5c79cbbbfacb5647b77931df1cff5 100644

--- a/content/browser/permissions/permission_service_impl.h

+++ b/content/browser/permissions/permission_service_impl.h

@@ -44,15 +44,14 @@ class PermissionServiceImpl : public PermissionService {

mojo::Callback<void(mojo::Array<PermissionStatus>)>;

struct PendingRequest {

- PendingRequest(PermissionType permission, const GURL& origin,

- const PermissionStatusCallback& callback);

+ PendingRequest(const PermissionsStatusCallback& callback,

+ int request_count);

~PendingRequest();

// Request ID received from the PermissionManager.

int id;

- PermissionType permission;

- GURL origin;

- PermissionStatusCallback callback;

+ PermissionsStatusCallback callback;

+ int request_count;

};

using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;

@@ -92,7 +91,12 @@ class PermissionServiceImpl : public PermissionService {

void OnConnectionError();

- void OnRequestPermissionResponse(int request_id, PermissionStatus status);

+ void OnRequestPermissionResponse(

+ int pending_request_id,

+ PermissionStatus status);

+ void OnRequestPermissionsResponse(

+ int pending_request_id,

+ const std::vector<PermissionStatus>& result);

PermissionStatus GetPermissionStatusFromName(PermissionName permission,

const GURL& origin);