| 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 81b963ffe30709dcbd50805ca1e4d62f10d5f824..2904c90a3fdc96c59c9123d8d00e703c85a24250 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::mojom::PermissionStatus)>& callback) {
|
| callback.Run(content::mojom::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::mojom::PermissionStatus>&)>& callback) {
|
| callback.Run(std::vector<content::mojom::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::mojom::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::mojom::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::mojom::PermissionStatus)>& callback) {
|
| return -1;
|
| }
|
|
|