| 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 d8e55195ae232e2a980ac3d68968ae66bde03935..765a7a38c62d26415cf5b707b63e01f553e19b1d 100644
|
| --- a/content/renderer/media/media_permission_dispatcher.cc
|
| +++ b/content/renderer/media/media_permission_dispatcher.cc
|
| @@ -15,17 +15,18 @@ namespace {
|
|
|
| using Type = media::MediaPermission::Type;
|
|
|
| -blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
|
| +permissions::mojom::PermissionName MediaPermissionTypeToPermissionName(
|
| + Type type) {
|
| switch (type) {
|
| case Type::PROTECTED_MEDIA_IDENTIFIER:
|
| - return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| + return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| case Type::AUDIO_CAPTURE:
|
| - return blink::mojom::PermissionName::AUDIO_CAPTURE;
|
| + return permissions::mojom::PermissionName::AUDIO_CAPTURE;
|
| case Type::VIDEO_CAPTURE:
|
| - return blink::mojom::PermissionName::VIDEO_CAPTURE;
|
| + return permissions::mojom::PermissionName::VIDEO_CAPTURE;
|
| }
|
| NOTREACHED();
|
| - return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| + return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
|
| }
|
|
|
| } // namespace
|
| @@ -115,7 +116,7 @@ uint32_t MediaPermissionDispatcher::RegisterCallback(
|
|
|
| void MediaPermissionDispatcher::OnPermissionStatus(
|
| uint32_t request_id,
|
| - blink::mojom::PermissionStatus status) {
|
| + permissions::mojom::PermissionStatus status) {
|
| DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
|
|
| @@ -125,7 +126,8 @@ void MediaPermissionDispatcher::OnPermissionStatus(
|
| PermissionStatusCB permission_status_cb = iter->second;
|
| requests_.erase(iter);
|
|
|
| - permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
|
| + permission_status_cb.Run(status ==
|
| + permissions::mojom::PermissionStatus::GRANTED);
|
| }
|
|
|
| } // namespace content
|
|
|