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

Unified Diff: media/mojo/services/interface_factory_impl.h

Issue 2882813002: media: Convert mojo media defines to buildflags (Closed)
Patch Set: rebase Created 3 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/interface_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9c0cbb94ea7bdb22c9370a4d7eec4e337eb80012..a5d3949ada82caa8508c399cdd8c7fea52eb7c67 100644
--- a/media/mojo/services/interface_factory_impl.h
+++ b/media/mojo/services/interface_factory_impl.h
@@ -8,6 +8,7 @@
#include <memory>
#include "base/macros.h"
+#include "media/mojo/features.h"
#include "media/mojo/interfaces/interface_factory.mojom.h"
#include "media/mojo/services/mojo_cdm_service_context.h"
#include "mojo/public/cpp/bindings/strong_binding_set.h"
@@ -38,35 +39,35 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory {
void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;
private:
-#if defined(ENABLE_MOJO_RENDERER)
+#if BUILDFLAG(ENABLE_MOJO_RENDERER)
RendererFactory* GetRendererFactory();
-#endif // defined(ENABLE_MOJO_RENDERER)
+#endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
-#if defined(ENABLE_MOJO_CDM)
+#if BUILDFLAG(ENABLE_MOJO_CDM)
CdmFactory* GetCdmFactory();
-#endif // defined(ENABLE_MOJO_CDM)
+#endif // BUILDFLAG(ENABLE_MOJO_CDM)
MojoCdmServiceContext cdm_service_context_;
-#if defined(ENABLE_MOJO_AUDIO_DECODER)
+#if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
mojo::StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_;
-#endif // defined(ENABLE_MOJO_AUDIO_DECODER)
+#endif // BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER)
-#if defined(ENABLE_MOJO_VIDEO_DECODER)
+#if BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
mojo::StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_;
-#endif // defined(ENABLE_MOJO_VIDEO_DECODER)
+#endif // BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
-#if defined(ENABLE_MOJO_RENDERER)
+#if BUILDFLAG(ENABLE_MOJO_RENDERER)
MediaLog* media_log_;
std::unique_ptr<RendererFactory> renderer_factory_;
mojo::StrongBindingSet<mojom::Renderer> renderer_bindings_;
-#endif // defined(ENABLE_MOJO_RENDERER)
+#endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
-#if defined(ENABLE_MOJO_CDM)
+#if BUILDFLAG(ENABLE_MOJO_CDM)
std::unique_ptr<CdmFactory> cdm_factory_;
service_manager::mojom::InterfaceProviderPtr interfaces_;
mojo::StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_;
-#endif // defined(ENABLE_MOJO_CDM)
+#endif // BUILDFLAG(ENABLE_MOJO_CDM)
std::unique_ptr<service_manager::ServiceContextRef> connection_ref_;
MojoMediaClient* mojo_media_client_;
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/interface_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698