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 6c212bac1d697d9f1d974670e940e09312c452f5..be915534e568b9356c97c5a86a8f38806a91f3b6 100644 |
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
@@ -125,8 +125,6 @@ bool MediaStreamDispatcherHost::OnMessageReceived( |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream) |
- IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStreamForDevice, |
- OnGenerateStreamForDevice) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelGenerateStream, |
OnCancelGenerateStream) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopGeneratedStream, |
@@ -173,32 +171,19 @@ void MediaStreamDispatcherHost::OnGenerateStream( |
<< security_origin.spec() << ")"; |
std::string label; |
- GetManager()->GenerateStream(this, render_process_id_, render_view_id, |
- components, security_origin, &label); |
- DCHECK(!label.empty()); |
- streams_[label] = StreamRequest(render_view_id, page_request_id); |
-} |
- |
-void MediaStreamDispatcherHost::OnGenerateStreamForDevice( |
- int render_view_id, |
- int page_request_id, |
- const media_stream::StreamOptions& components, |
- const std::string& device_id, |
- const GURL& security_origin) { |
- DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStreamForDevice(" |
- << render_view_id << ", " |
- << page_request_id << ", [" |
- << " audio:" << components.audio_type |
- << " video:" << components.video_type |
- << " ], " |
- << device_id << ", " |
- << security_origin.spec() << ")"; |
- DCHECK(!device_id.empty()); |
- |
- std::string label; |
- GetManager()->GenerateStreamForDevice( |
- this, render_process_id_, render_view_id, |
- components, device_id, security_origin, &label); |
+ if (components.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE || |
+ components.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) { |
+ const std::string& device_id = components.video_device_id; |
+ DCHECK(!device_id.empty()); |
+ // TODO(justinlin): Cleanup/get rid of GenerateStreamForDevice and merge |
+ // with the regular GenerateStream. |
+ GetManager()->GenerateStreamForDevice( |
+ this, render_process_id_, render_view_id, |
+ components, device_id, security_origin, &label); |
+ } else { |
+ GetManager()->GenerateStream(this, render_process_id_, render_view_id, |
+ components, security_origin, &label); |
+ } |
DCHECK(!label.empty()); |
streams_[label] = StreamRequest(render_view_id, page_request_id); |
} |