| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 79438b9ee74957bda1dec7431ddc17486b7ab07a..4123cf721b920aca71809221dd035f5a7755826a 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -33,18 +33,20 @@ class PermissionManager : public KeyedService,
|
| 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 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;
|
| @@ -55,7 +57,8 @@ class PermissionManager : public KeyedService,
|
| 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:
|
| @@ -74,7 +77,7 @@ class PermissionManager : public KeyedService,
|
| void OnPermissionsRequestResponseStatus(
|
| int request_id,
|
| int permission_id,
|
| - content::PermissionStatus status);
|
| + blink::mojom::PermissionStatus status);
|
|
|
| // Not all WebContents are able to display permission requests. If the PBM
|
| // is required but missing for |web_contents|, don't pass along the request.
|
|
|