Begin adding support for tab mirroring via the MediaStream audio/video capturing

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 19 matching lines @@
   DCHECK(streams_.empty());
 }
 
 void MediaStreamDispatcherHost::OnGenerateStream(
     int render_view_id,
     int page_request_id,
     const media_stream::StreamOptions& components,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
-           << page_request_id << ", [ "
-           << (components.audio ? "audio " : "")
-           << (components.video ? "video " : "")
-           << "], "
+           << 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);
   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,

[no longer working on chromium, 2012/09/10 09:11:04]

add a DCHECK to make sure device_id is not empty?

[miu, 2012/09/10 21:24:38]

Done.

+    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() << ")";
+
+  std::string label;
+  GetManager()->GenerateStreamForDevice(

[no longer working on chromium, 2012/09/10 09:11:04]

why not have the GenerateStreamForDevice return a std::string&.

[miu, 2012/09/10 21:24:38]

Google C++ style discourages returning non-POD types from functions (i.e., a
pointer to an output object should be provided for delivering the results).

+      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 << ")";
 
   for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); ++it) {
     if (it->second.render_view_id == render_view_id &&
         it->second.page_request_id == page_request_id) {
       GetManager()->CancelGenerateStream(it->first);
@@ skipping 47 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