Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: media/mojo/services/interface_factory_impl.h

Issue 2535303006: media: Fix a typo in interface_factory_impl.h (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_INTERFACE_FACTORY_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_INTERFACE_FACTORY_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_INTERFACE_FACTORY_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_INTERFACE_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
51 #if defined(ENABLE_MOJO_CDM) 51 #if defined(ENABLE_MOJO_CDM)
52 CdmFactory* GetCdmFactory(); 52 CdmFactory* GetCdmFactory();
53 #endif // defined(ENABLE_MOJO_CDM) 53 #endif // defined(ENABLE_MOJO_CDM)
54 54
55 MojoCdmServiceContext cdm_service_context_; 55 MojoCdmServiceContext cdm_service_context_;
56 56
57 #if defined(ENABLE_MOJO_AUDIO_DECODER) 57 #if defined(ENABLE_MOJO_AUDIO_DECODER)
58 StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_; 58 StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_;
59 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) 59 #endif // defined(ENABLE_MOJO_AUDIO_DECODER)
60 60
61 #if defined(ENABLE_MOJO_AUDIO_DECODER) 61 #if defined(ENABLE_MOJO_VIDEO_DECODER)
62 StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_; 62 StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_;
63 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) 63 #endif // defined(ENABLE_MOJO_VIDEO_DECODER)
64 64
65 #if defined(ENABLE_MOJO_RENDERER) 65 #if defined(ENABLE_MOJO_RENDERER)
66 std::unique_ptr<RendererFactory> renderer_factory_; 66 std::unique_ptr<RendererFactory> renderer_factory_;
67 StrongBindingSet<mojom::Renderer> renderer_bindings_; 67 StrongBindingSet<mojom::Renderer> renderer_bindings_;
68 #endif // defined(ENABLE_MOJO_RENDERER) 68 #endif // defined(ENABLE_MOJO_RENDERER)
69 69
70 #if defined(ENABLE_MOJO_CDM) 70 #if defined(ENABLE_MOJO_CDM)
71 std::unique_ptr<CdmFactory> cdm_factory_; 71 std::unique_ptr<CdmFactory> cdm_factory_;
72 service_manager::mojom::InterfaceProviderPtr interfaces_; 72 service_manager::mojom::InterfaceProviderPtr interfaces_;
73 StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_; 73 StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_;
74 #endif // defined(ENABLE_MOJO_CDM) 74 #endif // defined(ENABLE_MOJO_CDM)
75 75
76 scoped_refptr<MediaLog> media_log_; 76 scoped_refptr<MediaLog> media_log_;
77 std::unique_ptr<service_manager::ServiceContextRef> connection_ref_; 77 std::unique_ptr<service_manager::ServiceContextRef> connection_ref_;
78 MojoMediaClient* mojo_media_client_; 78 MojoMediaClient* mojo_media_client_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(InterfaceFactoryImpl); 80 DISALLOW_COPY_AND_ASSIGN(InterfaceFactoryImpl);
81 }; 81 };
82 82
83 } // namespace media 83 } // namespace media
84 84
85 #endif // MEDIA_MOJO_SERVICES_INTERFACE_FACTORY_IMPL_H_ 85 #endif // MEDIA_MOJO_SERVICES_INTERFACE_FACTORY_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698