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

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

Issue 2716873003: Replaces media::StrongBindingSet with mojo::StrongBindingSet. (Closed)
Patch Set: fixes build Created 3 years, 10 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 ef341713841adcdefa9089e6e1c6bf761d29e22c..19be2185c8404923ae0dd12b90b38a067dd72945 100644
--- a/media/mojo/services/interface_factory_impl.h
+++ b/media/mojo/services/interface_factory_impl.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "media/mojo/interfaces/interface_factory.mojom.h"
#include "media/mojo/services/mojo_cdm_service_context.h"
-#include "media/mojo/services/strong_binding_set.h"
+#include "mojo/public/cpp/bindings/strong_binding_set.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service_context_ref.h"
@@ -49,22 +49,22 @@ class InterfaceFactoryImpl : public mojom::InterfaceFactory {
MojoCdmServiceContext cdm_service_context_;
#if defined(ENABLE_MOJO_AUDIO_DECODER)
- StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_;
+ mojo::StrongBindingSet<mojom::AudioDecoder> audio_decoder_bindings_;
#endif // defined(ENABLE_MOJO_AUDIO_DECODER)
#if defined(ENABLE_MOJO_VIDEO_DECODER)
- StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_;
+ mojo::StrongBindingSet<mojom::VideoDecoder> video_decoder_bindings_;
#endif // defined(ENABLE_MOJO_VIDEO_DECODER)
#if defined(ENABLE_MOJO_RENDERER)
std::unique_ptr<RendererFactory> renderer_factory_;
- StrongBindingSet<mojom::Renderer> renderer_bindings_;
+ mojo::StrongBindingSet<mojom::Renderer> renderer_bindings_;
#endif // defined(ENABLE_MOJO_RENDERER)
#if defined(ENABLE_MOJO_CDM)
std::unique_ptr<CdmFactory> cdm_factory_;
service_manager::mojom::InterfaceProviderPtr interfaces_;
- StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_;
+ mojo::StrongBindingSet<mojom::ContentDecryptionModule> cdm_bindings_;
#endif // defined(ENABLE_MOJO_CDM)
scoped_refptr<MediaLog> media_log_;
« 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