Chromium Code Reviews| Index: chromecast/browser/cast_content_browser_client.cc |
| diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc |
| index 1dc6b81154811202d0be04f11adc6d3385b31ddf..c5f5fd589c5bed2d6c6880132f077fc17c4e617e 100644 |
| --- a/chromecast/browser/cast_content_browser_client.cc |
| +++ b/chromecast/browser/cast_content_browser_client.cc |
| @@ -23,6 +23,7 @@ |
| #include "chromecast/browser/media/cma_message_filter_host.h" |
| #include "chromecast/browser/url_request_context_factory.h" |
| #include "chromecast/common/global_descriptors.h" |
| +#include "chromecast/media/audio/audio_manager_factory.h" |
| #include "chromecast/media/base/media_message_loop.h" |
| #include "chromecast/public/cast_media_shlib.h" |
| #include "chromecast/public/media/media_pipeline_backend.h" |
| @@ -74,9 +75,14 @@ CastContentBrowserClient::GetBrowserMessageFilters() { |
| scoped_ptr<::media::AudioManagerFactory> |
| CastContentBrowserClient::CreateAudioManagerFactory() { |
| - // Return nullptr. The factory will not be set, and the statically linked |
| + LOG(INFO) << __FUNCTION__; |
|
halliwell
2015/08/28 15:14:18
remove
alokp
2015/09/01 00:23:11
Done.
|
| +#if defined(OS_ANDROID) |
| + // Return nullptr. The factory will not be set, and the default |
| // implementation of AudioManager will be used. |
| return scoped_ptr<::media::AudioManagerFactory>(); |
| +#else |
| + return make_scoped_ptr(new media::AudioManagerFactory); |
| +#endif |
| } |
|
halliwell
2015/08/28 15:14:18
Question: why do we need this function now? Isn't
slan
2015/08/31 16:59:56
Right. In fact, this probably doesn't even need to
alokp
2015/09/01 00:23:11
Long story - I will explain this offline.
|
| #if !defined(OS_ANDROID) |