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

Unified Diff: chrome/browser/media/webrtc/media_permission.cc

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests Created 3 years, 10 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
Index: chrome/browser/media/webrtc/media_permission.cc
diff --git a/chrome/browser/media/webrtc/media_permission.cc b/chrome/browser/media/webrtc/media_permission.cc
index 064d4ae04114b57cc43ce16021101c579df12b9f..13b3dcafa73d0899a8155179a12f26714687fd1e 100644
--- a/chrome/browser/media/webrtc/media_permission.cc
+++ b/chrome/browser/media/webrtc/media_permission.cc
@@ -106,21 +106,14 @@ ContentSetting MediaPermission::GetPermissionStatus(
#endif // defined(OS_CHROMEOS)
// Check policy and content settings.
- blink::mojom::PermissionStatus status =
- permission_manager->GetPermissionStatus(
- content_type_, requesting_origin_, embedding_origin_);
- switch (status) {
- case blink::mojom::PermissionStatus::DENIED:
- *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
- return CONTENT_SETTING_BLOCK;
- case blink::mojom::PermissionStatus::ASK:
- return CONTENT_SETTING_ASK;
- case blink::mojom::PermissionStatus::GRANTED:
- return CONTENT_SETTING_ALLOW;
- }
-
- NOTREACHED();
- return CONTENT_SETTING_BLOCK;
+ ContentSetting content_setting =
+ permission_manager
+ ->GetPermissionStatus(content_type_, requesting_origin_,
+ embedding_origin_)
+ .content_setting;
+ if (content_setting == CONTENT_SETTING_BLOCK)
+ *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
+ return content_setting;
}
ContentSetting MediaPermission::GetPermissionStatusWithDeviceRequired(

Powered by Google App Engine
This is Rietveld 408576698