Media Related changes for TabCapture API

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
@@ skipping 107 matching lines @@
 
   Send(new MediaStreamMsg_DeviceOpened(
       request.render_view_id, request.page_request_id, label, video_device));
 }
 
 bool MediaStreamDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* message_was_ok) {
   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,
                         OnStopGeneratedStream)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices,
                         OnEnumerateDevices)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_OpenDevice,
                         OnOpenDevice)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
@@ skipping 26 matching lines @@
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_type
            << " video:" << components.video_type
            << " ], "
            << security_origin.spec() << ")";
 
   std::string label;
-  GetManager()->GenerateStream(this, render_process_id_, render_view_id,
-                               components, 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

[miu, 2012/10/12 01:10:50]

Please remember to file a bug for this.

[justinlin, 2012/10/12 03:02:31]

Done. http://code.google.com/p/chromium/issues/detail?id=155444

+    // 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);
 }
 
 void MediaStreamDispatcherHost::OnGenerateStreamForDevice(

[wjia(left Chromium), 2012/10/11 22:13:27]

You can remove this handler function since the corresponding message has been
removed.

[justinlin, 2012/10/12 00:50:22]

Done.

     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);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
                                                        int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
            << render_view_id << ", "
            << page_request_id << ")";
 
@@ skipping 51 matching lines @@
                         device_id, type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
   return BrowserMainLoop::GetMediaStreamManager();
 }
 
 }  // namespace media_stream