| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index d6d917b4c3f3ac7a90f23333b621bec4cf94a67f..c00ad5e75d1edaeb5a4491fcfe75f9fe1222c06d 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -163,6 +163,7 @@
|
| #if defined(OS_CHROMEOS)
|
| #include "base/memory/memory_pressure_monitor_chromeos.h"
|
| #include "chromeos/chromeos_switches.h"
|
| +#include "chromeos/audio/cras_audio_handler.h"
|
| #endif
|
|
|
| #if defined(USE_GLIB)
|
| @@ -1524,7 +1525,12 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| {
|
| TRACE_EVENT0("startup",
|
| "BrowserMainLoop::BrowserThreadsStarted:InitMediaStreamManager");
|
| - media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
|
| +#if defined(IS_CHROMEOS)
|
| + media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get(),
|
| + static_cast<component::VideoCaptureObserver*>(CrasAudioHandler::Get())));
|
| +#else
|
| + media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()), NULL);
|
| +#endif
|
| }
|
|
|
| {
|
|
|