| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #endif // defined(ENABLE_MOJO_RENDERER) | 51 #endif // defined(ENABLE_MOJO_RENDERER) |
| 52 | 52 |
| 53 #if defined(ENABLE_MOJO_CDM) | 53 #if defined(ENABLE_MOJO_CDM) |
| 54 CdmFactory* GetCdmFactory(); | 54 CdmFactory* GetCdmFactory(); |
| 55 | 55 |
| 56 std::unique_ptr<CdmFactory> cdm_factory_; | 56 std::unique_ptr<CdmFactory> cdm_factory_; |
| 57 #endif // defined(ENABLE_MOJO_CDM) | 57 #endif // defined(ENABLE_MOJO_CDM) |
| 58 | 58 |
| 59 MojoCdmServiceContext cdm_service_context_; | 59 MojoCdmServiceContext cdm_service_context_; |
| 60 mojo::StrongBinding<mojom::ServiceFactory> binding_; | 60 mojo::StrongBinding<mojom::ServiceFactory> binding_; |
| 61 #if defined(ENABLE_MOJO_CDM) |
| 61 shell::mojom::InterfaceProvider* interfaces_; | 62 shell::mojom::InterfaceProvider* interfaces_; |
| 63 #endif |
| 64 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_CDM) || \ |
| 65 defined(ENABLE_MOJO_RENDERER) |
| 66 MojoMediaClient* mojo_media_client_; |
| 67 #endif |
| 62 scoped_refptr<MediaLog> media_log_; | 68 scoped_refptr<MediaLog> media_log_; |
| 63 std::unique_ptr<shell::ShellConnectionRef> connection_ref_; | 69 std::unique_ptr<shell::ShellConnectionRef> connection_ref_; |
| 64 MojoMediaClient* mojo_media_client_; | |
| 65 | 70 |
| 66 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); | 71 DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl); |
| 67 }; | 72 }; |
| 68 | 73 |
| 69 } // namespace media | 74 } // namespace media |
| 70 | 75 |
| 71 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ | 76 #endif // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_ |
| OLD | NEW |