Chromium Code Reviews| Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| index 51b3395be23a91b8da3da063fe6c5bda2e05de11..657402e97b83fefd59589c9755a2ead083f75329 100644 |
| --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| @@ -16,11 +16,13 @@ namespace content { |
| MediaStreamDispatcherHost::MediaStreamDispatcherHost( |
| int render_process_id, |
| const ResourceContext::SaltCallback& salt_callback, |
| - MediaStreamManager* media_stream_manager) |
| + MediaStreamManager* media_stream_manager, |
| + ResourceContext* resource_context) |
| : BrowserMessageFilter(MediaStreamMsgStart), |
| render_process_id_(render_process_id), |
| salt_callback_(salt_callback), |
| - media_stream_manager_(media_stream_manager) { |
| + media_stream_manager_(media_stream_manager), |
| + resource_context_(resource_context) { |
| } |
| void MediaStreamDispatcherHost::StreamGenerated( |
| @@ -178,9 +180,13 @@ void MediaStreamDispatcherHost::OnEnumerateDevices( |
| if (!IsURLAllowed(security_origin)) |
| return; |
| + bool have_permission = type == MEDIA_DEVICE_AUDIO_CAPTURE ? |
|
no longer working on chromium
2014/06/02 11:57:42
will type be others? if not, add
DCHECK(type == ME
Henrik Grunell
2014/06/03 07:52:27
No. Done.
|
| + resource_context_->AllowMicAccess(security_origin) : |
| + resource_context_->AllowCameraAccess(security_origin); |
| + |
| media_stream_manager_->EnumerateDevices( |
| this, render_process_id_, render_view_id, salt_callback_, |
| - page_request_id, type, security_origin); |
| + page_request_id, type, security_origin, have_permission); |
| } |
| void MediaStreamDispatcherHost::OnCancelEnumerateDevices( |