| 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..7e4b7b20736d12a9e03aeb8921009a2f1e678d23 100644
|
| --- a/blimp/engine/app/blimp_permission_manager.cc
|
| +++ b/blimp/engine/app/blimp_permission_manager.cc
|
| @@ -21,8 +21,8 @@ int BlimpPermissionManager::RequestPermission(
|
| content::PermissionType permission,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& origin,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) {
|
| - callback.Run(content::PermissionStatus::DENIED);
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| + callback.Run(blink::mojom::PermissionStatus::DENIED);
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -30,10 +30,10 @@ int BlimpPermissionManager::RequestPermissions(
|
| const std::vector<content::PermissionType>& permission,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
|
| - callback) {
|
| - callback.Run(std::vector<content::PermissionStatus>(
|
| - permission.size(), content::PermissionStatus::DENIED));
|
| + const base::Callback<
|
| + void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
|
| + callback.Run(std::vector<blink::mojom::PermissionStatus>(
|
| + permission.size(), blink::mojom::PermissionStatus::DENIED));
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -43,11 +43,11 @@ void BlimpPermissionManager::ResetPermission(content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) {}
|
|
|
| -content::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
|
| +blink::mojom::PermissionStatus BlimpPermissionManager::GetPermissionStatus(
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) {
|
| - return content::PermissionStatus::DENIED;
|
| + return blink::mojom::PermissionStatus::DENIED;
|
| }
|
|
|
| void BlimpPermissionManager::RegisterPermissionUsage(
|
| @@ -59,7 +59,7 @@ int BlimpPermissionManager::SubscribePermissionStatusChange(
|
| content::PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(content::PermissionStatus)>& callback) {
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| return -1;
|
| }
|
|
|
|
|