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

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

Issue 2945243002: Permissions: Allow PermissionManager to return more PermissionStatusSources.
Patch Set: Cleanup. Created 3 years, 6 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_stream_device_permission_context.cc
diff --git a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
index 7a8813f03e4636fa613679c7be33f0db05d12b60..447f246ed849a5bd3380e424963b8844ed2fa3f2 100644
--- a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
+++ b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc
@@ -54,7 +54,8 @@ void MediaStreamDevicePermissionContext::DecidePermission(
callback);
}
-ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
+PermissionResult
+MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
const GURL& embedding_origin) const {
@@ -76,22 +77,24 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
switch (policy) {
case ALWAYS_DENY:
- return CONTENT_SETTING_BLOCK;
+ return PermissionResult(CONTENT_SETTING_BLOCK,
+ PermissionStatusSource::ENTERPRISE_POLICY);
case ALWAYS_ALLOW:
- return CONTENT_SETTING_ALLOW;
+ return PermissionResult(CONTENT_SETTING_ALLOW,
+ PermissionStatusSource::ENTERPRISE_POLICY);
default:
DCHECK_EQ(POLICY_NOT_SET, policy);
}
// Check the content setting. TODO(raymes): currently mic/camera permission
// doesn't consider the embedder.
- ContentSetting setting = PermissionContextBase::GetPermissionStatusInternal(
+ PermissionResult result = PermissionContextBase::GetPermissionStatusInternal(
render_frame_host, requesting_origin, requesting_origin);
- if (setting == CONTENT_SETTING_DEFAULT)
- setting = CONTENT_SETTING_ASK;
+ if (result.content_setting == CONTENT_SETTING_DEFAULT)
+ result.content_setting = CONTENT_SETTING_ASK;
- return setting;
+ return result;
}
void MediaStreamDevicePermissionContext::ResetPermission(

Powered by Google App Engine
This is Rietveld 408576698