| Index: chromecast/browser/cast_permission_manager.cc
|
| diff --git a/chromecast/browser/cast_permission_manager.cc b/chromecast/browser/cast_permission_manager.cc
|
| index dba5614289a430445d92929e324acaaaccb1cd22..92ab9d91886f1eaa859a5421c3aad614411b8692 100644
|
| --- a/chromecast/browser/cast_permission_manager.cc
|
| +++ b/chromecast/browser/cast_permission_manager.cc
|
| @@ -21,7 +21,7 @@ CastPermissionManager::~CastPermissionManager() {
|
| int CastPermissionManager::RequestPermission(
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const base::Callback<void(content::PermissionStatus)>& callback) {
|
| LOG(INFO) << __FUNCTION__ << ": " << static_cast<int>(permission);
|
| callback.Run(content::PermissionStatus::GRANTED);
|
| @@ -31,9 +31,9 @@ int CastPermissionManager::RequestPermission(
|
| int CastPermissionManager::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) {
|
| + const url::Origin& requesting_origin,
|
| + const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
|
| + callback) {
|
| callback.Run(std::vector<content::PermissionStatus>(
|
| permissions.size(), content::PermissionStatus::GRANTED));
|
| return kNoPendingOperation;
|
| @@ -44,28 +44,26 @@ void CastPermissionManager::CancelPermissionRequest(int request_id) {
|
|
|
| void CastPermissionManager::ResetPermission(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {
|
| -}
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {}
|
|
|
| content::PermissionStatus CastPermissionManager::GetPermissionStatus(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {
|
| LOG(INFO) << __FUNCTION__ << ": " << static_cast<int>(permission);
|
| return content::PermissionStatus::GRANTED;
|
| }
|
|
|
| void CastPermissionManager::RegisterPermissionUsage(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {
|
| -}
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {}
|
|
|
| int CastPermissionManager::SubscribePermissionStatusChange(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin,
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin,
|
| const base::Callback<void(content::PermissionStatus)>& callback) {
|
| return kNoPendingOperation;
|
| }
|
|
|