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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 348443002: Revert 274823 "Support for audio output devices for getMediaDevi..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2057/src/
Patch Set: Created 6 years, 6 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/media_stream_capture_indicator.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_dispatcher_host.cc (revision 278170)
+++ content/browser/renderer_host/media/media_stream_dispatcher_host.cc (working copy)
@@ -181,12 +181,10 @@
return;
DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
- type == MEDIA_DEVICE_VIDEO_CAPTURE ||
- type == MEDIA_DEVICE_AUDIO_OUTPUT);
- bool have_permission =
- type == MEDIA_DEVICE_AUDIO_CAPTURE || type == MEDIA_DEVICE_AUDIO_OUTPUT ?
- resource_context_->AllowMicAccess(security_origin) :
- resource_context_->AllowCameraAccess(security_origin);
+ type == MEDIA_DEVICE_VIDEO_CAPTURE);
+ bool have_permission = type == MEDIA_DEVICE_AUDIO_CAPTURE ?
+ resource_context_->AllowMicAccess(security_origin) :
+ resource_context_->AllowCameraAccess(security_origin);
media_stream_manager_->EnumerateDevices(
this, render_process_id_, render_view_id, salt_callback_,
« no previous file with comments | « chrome/browser/media/media_stream_capture_indicator.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698