| 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 0bb24f486164772f39d6f8de4c4b8e5f03bd9898..eeac2a7c27c57b30c8a39ba5f2d4891fcb0d01fd 100644
|
| --- a/android_webview/browser/aw_permission_manager.h
|
| +++ b/android_webview/browser/aw_permission_manager.h
|
| @@ -26,18 +26,20 @@ class AwPermissionManager : public content::PermissionManager {
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| + const base::Callback<void(blink::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<content::PermissionStatus>&)>& callback) override;
|
| + 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)
|
| + override;
|
| void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| - content::PermissionStatus GetPermissionStatus(
|
| + blink::mojom::PermissionStatus GetPermissionStatus(
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| @@ -48,7 +50,8 @@ class AwPermissionManager : public content::PermissionManager {
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
|
| + override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
| private:
|
| @@ -62,7 +65,7 @@ class AwPermissionManager : public content::PermissionManager {
|
| static void OnRequestResponse(
|
| const base::WeakPtr<AwPermissionManager>& manager,
|
| int request_id,
|
| - const base::Callback<void(content::PermissionStatus)>& callback,
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
|
| bool allowed);
|
|
|
| PendingRequestsMap pending_requests_;
|
|
|