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

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

Issue 1840453003: media: Only provide necessary services in ServiceFactoryImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 9 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/media_apptest.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/service_factory_impl.h
diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h
index c7c144d3a837088943689195ce7bbcc75114e894..0b54e009852ca4b932eb1b5bbf42671c6ed45e12 100644
--- a/media/mojo/services/service_factory_impl.h
+++ b/media/mojo/services/service_factory_impl.h
@@ -47,20 +47,25 @@ class ServiceFactoryImpl : public interfaces::ServiceFactory {
mojo::InterfaceRequest<interfaces::ContentDecryptionModule> cdm) final;
private:
+#if defined(ENABLE_MOJO_RENDERER)
RendererFactory* GetRendererFactory();
+
+ scoped_ptr<RendererFactory> renderer_factory_;
+#endif // defined(ENABLE_MOJO_RENDERER)
+
+#if defined(ENABLE_MOJO_CDM)
CdmFactory* GetCdmFactory();
- MojoCdmServiceContext cdm_service_context_;
+ scoped_ptr<CdmFactory> cdm_factory_;
+#endif // defined(ENABLE_MOJO_CDM)
+ MojoCdmServiceContext cdm_service_context_;
mojo::StrongBinding<interfaces::ServiceFactory> binding_;
mojo::shell::mojom::InterfaceProvider* interfaces_;
scoped_refptr<MediaLog> media_log_;
scoped_ptr<mojo::MessageLoopRef> parent_app_refcount_;
MojoMediaClient* mojo_media_client_;
- scoped_ptr<RendererFactory> renderer_factory_;
- scoped_ptr<CdmFactory> cdm_factory_;
-
DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
};
« no previous file with comments | « media/mojo/services/media_apptest.cc ('k') | media/mojo/services/service_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698