content/browser/renderer_host/media/device_request_message_filter.cc - Issue 483523006: Check all settings when checking mic and camera access

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: content/browser/renderer_host/media/device_request_message_filter.cc

Issue 483523006: Check all settings when checking mic and camera access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Build fix for Android. Created 6 years, 4 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/browser/loader/resource_scheduler_unittest.cc ('k') | content/browser/renderer_host/media/device_request_message_filter_unittest.cc » ('j') | content/public/browser/content_browser_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/device_request_message_filter.cc

diff --git a/content/browser/renderer_host/media/device_request_message_filter.cc b/content/browser/renderer_host/media/device_request_message_filter.cc

index d15039d12685dab3526356dfc326b118b0bd949e..6fa538399682636b9f567a765df68d3f7297a887 100644

--- a/content/browser/renderer_host/media/device_request_message_filter.cc

+++ b/content/browser/renderer_host/media/device_request_message_filter.cc

@@ -131,16 +131,14 @@ void DeviceRequestMessageFilter::OnGetSources(int request_id,

// Make request to get audio devices.

const std::string& audio_label = media_stream_manager_->EnumerateDevices(

- this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1,

- MEDIA_DEVICE_AUDIO_CAPTURE, security_origin,

- resource_context_->AllowMicAccess(security_origin));

+ this, render_process_id_, -1, resource_context_->GetMediaDeviceIDSalt(),

+ -1, MEDIA_DEVICE_AUDIO_CAPTURE, security_origin);

DCHECK(!audio_label.empty());

// Make request for video devices.

const std::string& video_label = media_stream_manager_->EnumerateDevices(

- this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1,

- MEDIA_DEVICE_VIDEO_CAPTURE, security_origin,

- resource_context_->AllowCameraAccess(security_origin));

+ this, render_process_id_, -1, resource_context_->GetMediaDeviceIDSalt(),

+ -1, MEDIA_DEVICE_VIDEO_CAPTURE, security_origin);

DCHECK(!video_label.empty());

requests_.push_back(DeviceRequest(