| Index: android_webview/browser/aw_permission_manager.h
|
| diff --git a/android_webview/browser/aw_permission_manager.h b/android_webview/browser/aw_permission_manager.h
|
| index 9de09de8965b0f32e795b61e8c06e11327bdcde1..9748e0f9dd8db44986bf0a0a768561b2c2d41e06 100644
|
| --- a/android_webview/browser/aw_permission_manager.h
|
| +++ b/android_webview/browser/aw_permission_manager.h
|
| @@ -27,20 +27,20 @@ class AwPermissionManager : public content::PermissionManager {
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| - override;
|
| + const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| + callback) override;
|
| int RequestPermissions(
|
| const std::vector<content::PermissionType>& permissions,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<
|
| - void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
|
| + const base::Callback<void(
|
| + const std::vector<permissions::mojom::PermissionStatus>&)>& callback)
|
| override;
|
| void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| - blink::mojom::PermissionStatus GetPermissionStatus(
|
| + permissions::mojom::PermissionStatus GetPermissionStatus(
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| @@ -51,8 +51,8 @@ class AwPermissionManager : public content::PermissionManager {
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| - override;
|
| + const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| + callback) override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
| private:
|
| @@ -66,7 +66,8 @@ class AwPermissionManager : public content::PermissionManager {
|
| static void OnRequestResponse(
|
| const base::WeakPtr<AwPermissionManager>& manager,
|
| int request_id,
|
| - const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
|
| + const base::Callback<void(permissions::mojom::PermissionStatus)>&
|
| + callback,
|
| bool allowed);
|
|
|
| PendingRequestsMap pending_requests_;
|
|
|