Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 2932aeb6cef63243ef55b6ae436a934849a35d43..ab223c97836bcb0e1e5b49a78238bc79f4b5e9c6 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -25,6 +25,9 @@ |
#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" |
@@ -210,6 +213,10 @@ media::AudioManager* BrowserMainLoop::GetAudioManager() { |
return g_current_browser_main_loop->audio_manager_.get(); |
} |
+// static |
+media_stream::MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() { |
+ return g_current_browser_main_loop->media_stream_manager_.get(); |
+} |
// BrowserMainLoop construction / destruction ============================= |
BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters) |
@@ -325,6 +332,13 @@ void BrowserMainLoop::MainMessageLoopStart() { |
network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); |
audio_manager_.reset(media::AudioManager::Create()); |
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)); |
#if defined(OS_WIN) |
system_message_window_.reset(new SystemMessageWindowWin); |
@@ -470,6 +484,8 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { |
speech_recognition_manager_.reset(); |
+ BrowserThread::DeleteOnIOThread::Destruct(media_stream_manager_.release()); |
tommi (sloooow) - chröme
2012/07/04 13:46:48
maybe add a little comment here to explain why we
no longer working on chromium
2012/07/04 14:31:39
Done.
|
+ |
#if defined(USE_AURA) |
ImageTransportFactory::Terminate(); |
#endif |