Index: content/browser/permissions/permission_service_impl.cc |
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc |
index 757c2932375697e890c07fb0494d3be151a3d629..39daa6434744e97e8fde6e6cbefb1aee0ee1ba90 100644 |
--- a/content/browser/permissions/permission_service_impl.cc |
+++ b/content/browser/permissions/permission_service_impl.cc |
@@ -50,7 +50,7 @@ PermissionType PermissionNameToPermissionType(PermissionName name) { |
// This function allows the usage of the the multiple request map |
// with single requests. |
void PermissionRequestResponseCallbackWrapper( |
- const mojo::Callback<void(PermissionStatus)>& callback, |
+ const base::Callback<void(PermissionStatus)>& callback, |
mojo::Array<PermissionStatus> vector) { |
DCHECK_EQ(vector.size(), 1ul); |
callback.Run(vector[0]); |
@@ -59,7 +59,7 @@ void PermissionRequestResponseCallbackWrapper( |
} // anonymous namespace |
PermissionServiceImpl::PendingRequest::PendingRequest( |
- const PermissionsStatusCallback& callback, |
+ const RequestPermissionsCallback& callback, |
int request_count) |
: callback(callback), |
request_count(request_count) { |
@@ -162,7 +162,7 @@ void PermissionServiceImpl::RequestPermissions( |
mojo::Array<PermissionName> permissions, |
const mojo::String& origin, |
bool user_gesture, |
- const PermissionsStatusCallback& callback) { |
+ const RequestPermissionsCallback& callback) { |
if (permissions.is_null()) { |
callback.Run(mojo::Array<PermissionStatus>()); |
return; |
@@ -215,7 +215,7 @@ void PermissionServiceImpl::OnRequestPermissionsResponse( |
int pending_request_id, |
const std::vector<PermissionStatus>& result) { |
PendingRequest* request = pending_requests_.Lookup(pending_request_id); |
- PermissionsStatusCallback callback(request->callback); |
+ RequestPermissionsCallback callback(request->callback); |
request->callback.Reset(); |
pending_requests_.Remove(pending_request_id); |
callback.Run(mojo::Array<PermissionStatus>::From(result)); |