| Index: content/shell/browser/shell_permission_manager.cc
|
| diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc
|
| index f41b32672edef15a633c7e09a6e06c2642fbbda6..e37fd8b26f192ef5aae6707eaa234bd331474d13 100644
|
| --- a/content/shell/browser/shell_permission_manager.cc
|
| +++ b/content/shell/browser/shell_permission_manager.cc
|
| @@ -23,10 +23,10 @@ int ShellPermissionManager::RequestPermission(
|
| PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(PermissionStatus)>& callback) {
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| callback.Run(permission == PermissionType::GEOLOCATION
|
| - ? PermissionStatus::GRANTED
|
| - : PermissionStatus::DENIED);
|
| + ? blink::mojom::PermissionStatus::GRANTED
|
| + : blink::mojom::PermissionStatus::DENIED);
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -34,13 +34,13 @@ int ShellPermissionManager::RequestPermissions(
|
| const std::vector<PermissionType>& permissions,
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| - const base::Callback<void(
|
| - const std::vector<PermissionStatus>&)>& callback) {
|
| - std::vector<PermissionStatus> result(permissions.size());
|
| + const base::Callback<
|
| + void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) {
|
| + std::vector<blink::mojom::PermissionStatus> result(permissions.size());
|
| for (const auto& permission : permissions) {
|
| result.push_back(permission == PermissionType::GEOLOCATION
|
| - ? PermissionStatus::GRANTED
|
| - : PermissionStatus::DENIED);
|
| + ? blink::mojom::PermissionStatus::GRANTED
|
| + : blink::mojom::PermissionStatus::DENIED);
|
| }
|
| callback.Run(result);
|
| return kNoPendingOperation;
|
| @@ -55,7 +55,7 @@ void ShellPermissionManager::ResetPermission(
|
| const GURL& embedding_origin) {
|
| }
|
|
|
| -PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| +blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) {
|
| @@ -64,9 +64,9 @@ PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| permission == PermissionType::VIDEO_CAPTURE) &&
|
| command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
|
| command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
|
| - return PermissionStatus::GRANTED;
|
| + return blink::mojom::PermissionStatus::GRANTED;
|
| }
|
| - return PermissionStatus::DENIED;
|
| + return blink::mojom::PermissionStatus::DENIED;
|
| }
|
|
|
| void ShellPermissionManager::RegisterPermissionUsage(
|
| @@ -79,7 +79,7 @@ int ShellPermissionManager::SubscribePermissionStatusChange(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(PermissionStatus)>& callback) {
|
| + const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
|
| return kNoPendingOperation;
|
| }
|
|
|
|
|