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..80536816dcd91542c2d2fed85fa78062e72d3d55 100644 |
--- a/content/browser/permissions/permission_service_impl.h |
+++ b/content/browser/permissions/permission_service_impl.h |
@@ -26,7 +26,6 @@ enum class PermissionType; |
class PermissionServiceImpl : public PermissionService { |
public: |
~PermissionServiceImpl() override; |
- |
mlamouri (slow - plz ping)
2015/09/23 16:37:37
nit: do not remove this line.
Lalit Maganti
2015/09/24 09:24:11
Done.
|
// Clear pending operations currently run by the service. This will be called |
// by PermissionServiceContext when it will need the service to clear its |
// state for example, if the frame changes. |
@@ -44,15 +43,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 +90,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); |