chrome/browser/media/webrtc/media_stream_device_permission_context.cc - Issue 2586153002: Move kill switch and secure origin checking logic

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2586153002: Move kill switch and secure origin checking logic (Closed)

Patch Set: Move kill switch and secure origin checking logic Created 4 years 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 | « chrome/browser/media/webrtc/media_stream_device_permission_context.h ('k') | chrome/browser/notifications/notification_permission_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 171c207234472a34427ad57c0f1827db385c563e..8220b345598a736aa6472c00f309bce88b9d13cf 100644

--- a/chrome/browser/media/webrtc/media_stream_device_permission_context.cc

+++ b/chrome/browser/media/webrtc/media_stream_device_permission_context.cc

@@ -33,7 +33,7 @@ void MediaStreamDevicePermissionContext::RequestPermission(

callback.Run(CONTENT_SETTING_BLOCK);

}

-ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatus(

+ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(

const GURL& requesting_origin,

const GURL& embedding_origin) const {

// TODO(raymes): Merge this policy check into content settings

@@ -63,7 +63,7 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatus(

// Check the content setting. TODO(raymes): currently mic/camera permission

// doesn't consider the embedder.

- ContentSetting setting = PermissionContextBase::GetPermissionStatus(

+ ContentSetting setting = PermissionContextBase::GetPermissionStatusInternal(

requesting_origin, requesting_origin);

if (setting == CONTENT_SETTING_DEFAULT)