| Index: chromecast/browser/cast_permission_manager.h
|
| diff --git a/chromecast/browser/cast_permission_manager.h b/chromecast/browser/cast_permission_manager.h
|
| index cb84c6a70ea690cba27406e10c1d468b44f3cb06..a879729a7c1143df07e0e03f8bf91cc8fb15aafc 100644
|
| --- a/chromecast/browser/cast_permission_manager.h
|
| +++ b/chromecast/browser/cast_permission_manager.h
|
| @@ -23,15 +23,14 @@ class CastPermissionManager : public content::PermissionManager {
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) override;
|
| + const base::Callback<void(permission::Status)>& 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(
|
| - content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) override;
|
| + permission::Status GetPermissionStatus(content::PermissionType permission,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin) override;
|
| void RegisterPermissionUsage(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
| @@ -39,7 +38,7 @@ class CastPermissionManager : 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(permission::Status)>& callback) override;
|
| void UnsubscribePermissionStatusChange(int subscription_id) override;
|
|
|
| private:
|
|
|