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