Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1710)

Unified Diff: content/renderer/media/media_permission_dispatcher.cc

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/media_permission_dispatcher.h ('k') | content/renderer/media/midi_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 765a7a38c62d26415cf5b707b63e01f553e19b1d..d8e55195ae232e2a980ac3d68968ae66bde03935 100644
--- a/content/renderer/media/media_permission_dispatcher.cc
+++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -15,18 +15,17 @@
using Type = media::MediaPermission::Type;
-permissions::mojom::PermissionName MediaPermissionTypeToPermissionName(
- Type type) {
+blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
switch (type) {
case Type::PROTECTED_MEDIA_IDENTIFIER:
- return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+ return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
case Type::AUDIO_CAPTURE:
- return permissions::mojom::PermissionName::AUDIO_CAPTURE;
+ return blink::mojom::PermissionName::AUDIO_CAPTURE;
case Type::VIDEO_CAPTURE:
- return permissions::mojom::PermissionName::VIDEO_CAPTURE;
+ return blink::mojom::PermissionName::VIDEO_CAPTURE;
}
NOTREACHED();
- return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+ return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
}
} // namespace
@@ -116,7 +115,7 @@
void MediaPermissionDispatcher::OnPermissionStatus(
uint32_t request_id,
- permissions::mojom::PermissionStatus status) {
+ blink::mojom::PermissionStatus status) {
DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
DCHECK(task_runner_->RunsTasksOnCurrentThread());
@@ -126,8 +125,7 @@
PermissionStatusCB permission_status_cb = iter->second;
requests_.erase(iter);
- permission_status_cb.Run(status ==
- permissions::mojom::PermissionStatus::GRANTED);
+ permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
}
} // namespace content
« no previous file with comments | « content/renderer/media/media_permission_dispatcher.h ('k') | content/renderer/media/midi_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698