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

Unified Diff: content/browser/renderer_host/media/device_request_message_filter.cc

Issue 287383002: Implement getMediaDevices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed StopEnumerateDevices in pepper. Created 6 years, 7 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: 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 4aaf2398d5593685ee4bf9501f928bfbe16d5876..ad71a0ca203eae96552043afa30cbe0bcbf9e349 100644
--- a/content/browser/renderer_host/media/device_request_message_filter.cc
+++ b/content/browser/renderer_host/media/device_request_message_filter.cc
@@ -111,8 +111,6 @@ void DeviceRequestMessageFilter::DevicesEnumerated(
Send(new MediaStreamMsg_GetSourcesACK(request_it->request_id, all_devices));
- media_stream_manager_->CancelRequest(request_it->audio_devices_label);
- media_stream_manager_->CancelRequest(request_it->video_devices_label);
requests_.erase(request_it);
}
@@ -147,13 +145,15 @@ 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);
+ MEDIA_DEVICE_AUDIO_CAPTURE, security_origin,
+ resource_context_->AllowMicAccess(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);
+ MEDIA_DEVICE_VIDEO_CAPTURE, security_origin,
+ resource_context_->AllowCameraAccess(security_origin));
DCHECK(!video_label.empty());
requests_.push_back(DeviceRequest(

Powered by Google App Engine
This is Rietveld 408576698