| Index: chromecast/browser/cast_permission_manager.cc
|
| diff --git a/chromecast/browser/cast_permission_manager.cc b/chromecast/browser/cast_permission_manager.cc
|
| index 047a6ff5a909f0cf85b1b390a77f767a6ab4beae..a0c3280f5d60073dbc91c9132657d389c648b2a5 100644
|
| --- a/chromecast/browser/cast_permission_manager.cc
|
| +++ b/chromecast/browser/cast_permission_manager.cc
|
| @@ -18,22 +18,18 @@ CastPermissionManager::CastPermissionManager()
|
| CastPermissionManager::~CastPermissionManager() {
|
| }
|
|
|
| -void CastPermissionManager::RequestPermission(
|
| +int CastPermissionManager::RequestPermission(
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| const GURL& origin,
|
| bool user_gesture,
|
| const base::Callback<void(content::PermissionStatus)>& callback) {
|
| LOG(INFO) << __FUNCTION__ << ": " << static_cast<int>(permission);
|
| callback.Run(content::PermissionStatus::PERMISSION_STATUS_GRANTED);
|
| + return kNoPendingRequestOrSubscription;
|
| }
|
|
|
| -void CastPermissionManager::CancelPermissionRequest(
|
| - content::PermissionType permission,
|
| - content::RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& origin) {
|
| +void CastPermissionManager::CancelPermissionRequest(int request_id) {
|
| }
|
|
|
| void CastPermissionManager::ResetPermission(
|
| @@ -61,7 +57,7 @@ int CastPermissionManager::SubscribePermissionStatusChange(
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| const base::Callback<void(content::PermissionStatus)>& callback) {
|
| - return -1;
|
| + return kNoPendingRequestOrSubscription;
|
| }
|
|
|
| void CastPermissionManager::UnsubscribePermissionStatusChange(
|
|
|