| Index: media/mojo/services/mojo_renderer_factory.h
|
| diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h
|
| index 3290b74ca0df5cac495e47e2abc863dc21ea6d71..54e7c1d450f324159e0c7ffc97b30f106b72dc6e 100644
|
| --- a/media/mojo/services/mojo_renderer_factory.h
|
| +++ b/media/mojo/services/mojo_renderer_factory.h
|
| @@ -5,16 +5,21 @@
|
| #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_
|
| #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_
|
|
|
| +#include "base/callback.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/renderer_factory.h"
|
| -#include "mojo/public/interfaces/application/service_provider.mojom.h"
|
| +#include "media/mojo/interfaces/media_renderer.mojom.h"
|
| +#include "mojo/public/cpp/bindings/interface_ptr.h"
|
|
|
| namespace media {
|
|
|
| // The default factory class for creating MojoRendererImpl.
|
| class MEDIA_EXPORT MojoRendererFactory : public RendererFactory {
|
| public:
|
| - MojoRendererFactory(mojo::ServiceProviderPtr renderer_service_provider);
|
| + typedef base::Callback<void(mojo::InterfacePtr<mojo::MediaRenderer>* ptr)>
|
| + ConnectToServiceCB;
|
| +
|
| + MojoRendererFactory(const ConnectToServiceCB& connect_to_service_cb);
|
| ~MojoRendererFactory() final;
|
|
|
| scoped_ptr<Renderer> CreateRenderer(
|
| @@ -22,7 +27,7 @@ class MEDIA_EXPORT MojoRendererFactory : public RendererFactory {
|
| AudioRendererSink* audio_renderer_sink) final;
|
|
|
| private:
|
| - mojo::ServiceProviderPtr renderer_service_provider_;
|
| + ConnectToServiceCB connect_to_service_cb_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory);
|
| };
|
|
|