chrome/browser/media/webrtc/media_stream_device_permission_context.cc - Issue 2723983004: Add PermissionManager::GetPermissionStatusForFrame function

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 2723983004: Add PermissionManager::GetPermissionStatusForFrame function (Closed)

Patch Set: Add PermissionManager::GetPermissionStatusForFrame function Created 3 years, 9 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 | « chrome/browser/media/webrtc/media_stream_device_permission_context.h ('k') | chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc » ('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 2d34b90316f8eafcccd82a3b91a6563b25b1f107..80b05a5242889fe973e06e23d525b107b72cbbcf 100644

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

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

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

}

ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(

+ content::RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

const GURL& embedding_origin) const {

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

@@ -63,7 +64,7 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(

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

// doesn't consider the embedder.

ContentSetting setting = PermissionContextBase::GetPermissionStatusInternal(

- requesting_origin, requesting_origin);

+ render_frame_host, requesting_origin, requesting_origin);

if (setting == CONTENT_SETTING_DEFAULT)

setting = CONTENT_SETTING_ASK;