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 208c05804ee155dce696949d11a32be2cae4f816..a7daafee9b24b1f896873b7b1294f33f11682b0c 100644 |
--- a/content/browser/permissions/permission_service_impl.h |
+++ b/content/browser/permissions/permission_service_impl.h |
@@ -5,7 +5,6 @@ |
#ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ |
#define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ |
-#include "base/callback.h" |
#include "base/id_map.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
@@ -42,16 +41,18 @@ |
private: |
using PermissionStatusCallback = |
- base::Callback<void(blink::mojom::PermissionStatus)>; |
+ mojo::Callback<void(blink::mojom::PermissionStatus)>; |
+ using PermissionsStatusCallback = |
+ mojo::Callback<void(mojo::Array<blink::mojom::PermissionStatus>)>; |
struct PendingRequest { |
- PendingRequest(const RequestPermissionsCallback& callback, |
+ PendingRequest(const PermissionsStatusCallback& callback, |
int request_count); |
~PendingRequest(); |
// Request ID received from the PermissionManager. |
int id; |
- RequestPermissionsCallback callback; |
+ PermissionsStatusCallback callback; |
int request_count; |
}; |
using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>; |
@@ -80,7 +81,7 @@ |
void RequestPermissions(mojo::Array<blink::mojom::PermissionName> permissions, |
const mojo::String& origin, |
bool user_gesture, |
- const RequestPermissionsCallback& callback) override; |
+ const PermissionsStatusCallback& callback) override; |
void RevokePermission(blink::mojom::PermissionName permission, |
const mojo::String& origin, |
const PermissionStatusCallback& callback) override; |