| Index: content/renderer/media/media_permission_dispatcher.cc
|
| diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc
|
| index ab6d7ec2c9692d5bb7106856d15b6e22f08fdd43..d8e55195ae232e2a980ac3d68968ae66bde03935 100644
|
| --- a/content/renderer/media/media_permission_dispatcher.cc
|
| +++ b/content/renderer/media/media_permission_dispatcher.cc
|
| @@ -15,17 +15,17 @@ namespace {
|
|
|
| using Type = media::MediaPermission::Type;
|
|
|
| -content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
|
| +blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
|
| switch (type) {
|
| case Type::PROTECTED_MEDIA_IDENTIFIER:
|
| - return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| + return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| case Type::AUDIO_CAPTURE:
|
| - return content::PermissionName::AUDIO_CAPTURE;
|
| + return blink::mojom::PermissionName::AUDIO_CAPTURE;
|
| case Type::VIDEO_CAPTURE:
|
| - return content::PermissionName::VIDEO_CAPTURE;
|
| + return blink::mojom::PermissionName::VIDEO_CAPTURE;
|
| }
|
| NOTREACHED();
|
| - return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| + return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| }
|
|
|
| } // namespace
|
| @@ -113,8 +113,9 @@ uint32_t MediaPermissionDispatcher::RegisterCallback(
|
| return request_id;
|
| }
|
|
|
| -void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
|
| - PermissionStatus status) {
|
| +void MediaPermissionDispatcher::OnPermissionStatus(
|
| + uint32_t request_id,
|
| + blink::mojom::PermissionStatus status) {
|
| DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
|
|
| @@ -124,7 +125,7 @@ void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
|
| PermissionStatusCB permission_status_cb = iter->second;
|
| requests_.erase(iter);
|
|
|
| - permission_status_cb.Run(status == PermissionStatus::GRANTED);
|
| + permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
|
| }
|
|
|
| } // namespace content
|
|
|