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 c73fa19abe1a435c804cbbf823bacf38c6c91de4..23091c73e501af6fb427f91ad97b3ebfa80c79e1 100644 |
| --- a/chromecast/browser/cast_content_browser_client.cc |
| +++ b/chromecast/browser/cast_content_browser_client.cc |
| @@ -26,6 +26,7 @@ |
| #include "chromecast/browser/service/cast_service_simple.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" |
| @@ -81,9 +82,13 @@ scoped_ptr<CastService> CastContentBrowserClient::CreateCastService( |
| scoped_ptr<::media::AudioManagerFactory> |
| CastContentBrowserClient::CreateAudioManagerFactory() { |
| - // Return nullptr. The factory will not be set, and the statically linked |
| +#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); |
|
gunsch
2015/09/18 21:23:07
From my understanding of this CL, this removes the
alokp
2015/09/18 21:42:14
The internal implementation needs to create a diff
gunsch
2015/09/18 21:57:06
SGTM.
Nit: prefer '()' when invoking empty constr
alokp
2015/09/18 22:08:49
Done.
|
| +#endif |
| } |
| #if !defined(OS_ANDROID) |