| Index: blimp/engine/app/blimp_permission_manager.h
|
| diff --git a/blimp/engine/app/blimp_permission_manager.h b/blimp/engine/app/blimp_permission_manager.h
|
| index a5ae164e2912588890cd7645bdc8065c873e5ec2..7b09262abd9c957c00659bc2fbd2e3bdf1f6c98b 100644
|
| --- a/blimp/engine/app/blimp_permission_manager.h
|
| +++ b/blimp/engine/app/blimp_permission_manager.h
|
| @@ -24,18 +24,20 @@ class BlimpPermissionManager : 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>& permission,
|
| 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;
|
| @@ -46,7 +48,8 @@ class BlimpPermissionManager : 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:
|
|
|