Chromium Code Reviews| Index: media/mojo/services/interface_factory_impl.h |
| diff --git a/media/mojo/services/interface_factory_impl.h b/media/mojo/services/interface_factory_impl.h |
| index ea15801605c69df888b1d0f9b20af976e83f9bf3..51d8508b75e811ada8b47b67998a7a0e0ced4405 100644 |
| --- a/media/mojo/services/interface_factory_impl.h |
| +++ b/media/mojo/services/interface_factory_impl.h |
| @@ -10,6 +10,7 @@ |
| #include "base/macros.h" |
| #include "media/mojo/interfaces/interface_factory.mojom.h" |
| #include "media/mojo/services/mojo_cdm_service_context.h" |
| +#include "media/mojo/services/strong_binding_set.h" |
| #include "services/service_manager/public/cpp/connector.h" |
| #include "services/service_manager/public/cpp/service_context_ref.h" |
| @@ -53,13 +54,23 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory { |
| MojoCdmServiceContext cdm_service_context_; |
| +#if defined(ENABLE_MOJO_AUDIO_DECODER) |
| + StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_; |
| +#endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
| + |
| +#if defined(ENABLE_MOJO_AUDIO_DECODER) |
|
Julien Isorce Samsung
2016/11/30 16:30:44
Should be ENABLE_MOJO_VIDEO_DECODER
xhwang
2016/11/30 17:38:49
oops, thanks!
I'll fix it now.
OOC, are you usin
|
| + StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_; |
| +#endif // defined(ENABLE_MOJO_AUDIO_DECODER) |
| + |
| #if defined(ENABLE_MOJO_RENDERER) |
| std::unique_ptr<RendererFactory> renderer_factory_; |
| + StrongBindingSet<mojom::Renderer> renderer_bindings_; |
| #endif // defined(ENABLE_MOJO_RENDERER) |
| #if defined(ENABLE_MOJO_CDM) |
| std::unique_ptr<CdmFactory> cdm_factory_; |
| service_manager::mojom::InterfaceProviderPtr interfaces_; |
| + StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_; |
| #endif // defined(ENABLE_MOJO_CDM) |
| scoped_refptr<MediaLog> media_log_; |