diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 02:53:08 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 02:53:08 +0000 |
| commit | 5f5dd4557415ba70311f639c96886091673effa0 (patch) | |
| tree | 0a75384dcbe04ac88dd1bcf9df8efeff1f6bfcf3 /content/browser/browser_main_loop.cc | |
| parent | 4bcb13b49b97cbf78667ae5b8272fae38255c520 (diff) | |
| download | chromium_src-5f5dd4557415ba70311f639c96886091673effa0.zip chromium_src-5f5dd4557415ba70311f639c96886091673effa0.tar.gz chromium_src-5f5dd4557415ba70311f639c96886091673effa0.tar.bz2 | |
Begin adding support for tab mirroring via the MediaStream audio/video capturing
framework. Expanded the scope of the content::MediaStreamDeviceType enum to
support the new concept of "internal capture devices." From there, many modules
were tweaked to account for the new concept. In some cases, significant new
functionality was added (described below). In this change, tab mirroring audio
and video capture devices have been introduced, but stubbed-out.
The following proposal provides more backrgound on this and the overall
motivation for the code changes at-hand:
http://dev.chromium.org/developers/design-documents/extensions/proposed-changes/apis-under-development/webrtc-tab-content-capture
Significant changes:
1. content/common/media and content/public/common -- a) Expand
content::MediaStreamDeviceType enum; b) Update media_stream::StreamOptions
so that extension API bindings can ask for any of the MediaStreamTypes.
2. content/browser/renderer_host/media -- Minor refactoring: MediaStreamManager
handles all MediaStreamDeviceTypes. Only supports EnumerateDevices and OpenDevice for
physical device types. Add new GenerateStreamForDevice() API.
3. chrome/browser/media and chrome/browser/ui -- Enhance "Allow/Deny and
device selection" infobar to handle all MediaStreamDeviceTypes.
Review URL: https://chromiumcodereview.appspot.com/10912004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 51552b6..9ecbf9e 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -26,9 +26,7 @@ #include "content/browser/in_process_webkit/webkit_thread.h" #include "content/browser/net/browser_online_state_observer.h" #include "content/browser/plugin_service_impl.h" -#include "content/browser/renderer_host/media/audio_input_device_manager.h" #include "content/browser/renderer_host/media/media_stream_manager.h" -#include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" #include "content/browser/speech/speech_recognition_manager_impl.h" #include "content/browser/trace_controller_impl.h" @@ -343,13 +341,8 @@ void BrowserMainLoop::MainMessageLoopStart() { } online_state_observer_.reset(new BrowserOnlineStateObserver); - scoped_refptr<media_stream::AudioInputDeviceManager> - audio_input_device_manager( - new media_stream::AudioInputDeviceManager(audio_manager_.get())); - scoped_refptr<media_stream::VideoCaptureManager> video_capture_manager( - new media_stream::VideoCaptureManager()); - media_stream_manager_.reset(new media_stream::MediaStreamManager( - audio_input_device_manager, video_capture_manager)); + media_stream_manager_.reset( + new media_stream::MediaStreamManager(audio_manager_.get())); // Prior to any processing happening on the io thread, we create the // plugin service as it is predominantly used from the io thread, |