| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ | 5 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ |
| 6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ | 6 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 ServiceFactoryImpl(mojo::InterfaceRequest<mojom::ServiceFactory> request, | 32 ServiceFactoryImpl(mojo::InterfaceRequest<mojom::ServiceFactory> request, |
| 33 shell::mojom::InterfaceProvider* interfaces, | 33 shell::mojom::InterfaceProvider* interfaces, |
| 34 scoped_refptr<MediaLog> media_log, | 34 scoped_refptr<MediaLog> media_log, |
| 35 std::unique_ptr<shell::ShellConnectionRef> connection_ref, | 35 std::unique_ptr<shell::ShellConnectionRef> connection_ref, |
| 36 MojoMediaClient* mojo_media_client); | 36 MojoMediaClient* mojo_media_client); |
| 37 ~ServiceFactoryImpl() final; | 37 ~ServiceFactoryImpl() final; |
| 38 | 38 |
| 39 // mojom::ServiceFactory implementation. | 39 // mojom::ServiceFactory implementation. |
| 40 void CreateAudioDecoder(mojom::AudioDecoderRequest request) final; | 40 void CreateAudioDecoder(mojom::AudioDecoderRequest request) final; |
| 41 void CreateVideoDecoder(mojom::VideoDecoderRequest request) final; | 41 void CreateVideoDecoder(mojom::VideoDecoderRequest request) final; |
| 42 void CreateRenderer(mojom::RendererRequest request) final; | 42 void CreateRenderer(mojom::RendererRequest request, |
| 43 const mojo::String& audio_device_id) final; |
| 43 void CreateCdm(mojom::ContentDecryptionModuleRequest request) final; | 44 void CreateCdm(mojom::ContentDecryptionModuleRequest request) final; |
| 44 | 45 |
| 45 private: | 46 private: |
| 46 #if defined(ENABLE_MOJO_RENDERER) | 47 #if defined(ENABLE_MOJO_RENDERER) |
| 47 RendererFactory* GetRendererFactory(); | 48 RendererFactory* GetRendererFactory(); |
| 48 | 49 |
| 49 std::unique_ptr<RendererFactory> renderer_factory_; | 50 std::unique_ptr<RendererFactory> renderer_factory_; |
| 50 #endif // defined(ENABLE_MOJO_RENDERER) | 51 #endif // defined(ENABLE_MOJO_RENDERER) |
| 51 | 52 |
| 52 #if defined(ENABLE_MOJO_CDM) | 53 #if defined(ENABLE_MOJO_CDM) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 66 #endif | 67 #endif |
| 67 scoped_refptr<MediaLog> media_log_; | 68 scoped_refptr<MediaLog> media_log_; |
| 68 std::unique_ptr<shell::ShellConnectionRef> connection_ref_; | 69 std::unique_ptr<shell::ShellConnectionRef> connection_ref_; |
| 69 | 70 |
| 70 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); | 71 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 } // namespace media | 74 } // namespace media |
| 74 | 75 |
| 75 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ | 76 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ |
| OLD | NEW |