| Index: blimp/engine/app/blimp_permission_manager.cc
|
| diff --git a/blimp/engine/app/blimp_permission_manager.cc b/blimp/engine/app/blimp_permission_manager.cc
|
| index cf4d9f56c34928bf80f1cf54a9680c34afff584b..ff44575bc961433c8b71e3e0ec5da246e671cd30 100644
|
| --- a/blimp/engine/app/blimp_permission_manager.cc
|
| +++ b/blimp/engine/app/blimp_permission_manager.cc
|
| @@ -20,7 +20,7 @@ BlimpPermissionManager::~BlimpPermissionManager() {}
|
| int BlimpPermissionManager::RequestPermission(
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const base::Callback<void(content::PermissionStatus)>& callback) {
|
| callback.Run(content::PermissionStatus::DENIED);
|
| return kNoPendingOperation;
|
| @@ -29,7 +29,7 @@ int BlimpPermissionManager::RequestPermission(
|
| int BlimpPermissionManager::RequestPermissions(
|
| const std::vector<content::PermissionType>& permission,
|
| content::RenderFrameHost* render_frame_host,
|
| - const GURL& requesting_origin,
|
| + const url::Origin& requesting_origin,
|
| const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
|
| callback) {
|
| callback.Run(std::vector<content::PermissionStatus>(
|
| @@ -39,26 +39,27 @@ int BlimpPermissionManager::RequestPermissions(
|
|
|
| void BlimpPermissionManager::CancelPermissionRequest(int request_id) {}
|
|
|
| -void BlimpPermissionManager::ResetPermission(content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {}
|
| +void BlimpPermissionManager::ResetPermission(
|
| + content::PermissionType permission,
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {}
|
|
|
| content::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {
|
| return content::PermissionStatus::DENIED;
|
| }
|
|
|
| void BlimpPermissionManager::RegisterPermissionUsage(
|
| content::PermissionType permission,
|
| - const GURL& requesting_origin,
|
| - const GURL& embedding_origin) {}
|
| + const url::Origin& requesting_origin,
|
| + const url::Origin& embedding_origin) {}
|
|
|
| int BlimpPermissionManager::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 -1;
|
| }
|
|
|