Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_MOJO_RENDERER_FACTORY_H_ | 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ |
| 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ | 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ |
| 7 | 7 |
| 8 #include "media/base/media_export.h" | 8 #include "media/base/media_export.h" |
| 9 #include "media/base/renderer_factory.h" | 9 #include "media/base/renderer_factory.h" |
| 10 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 10 #include "media/mojo/interfaces/media_renderer.mojom.h" |
| 11 #include "mojo/public/cpp/bindings/interface_ptr.h" | |
| 11 | 12 |
| 12 namespace media { | 13 namespace media { |
| 13 | 14 |
| 14 // The default factory class for creating MojoRendererImpl. | 15 // The default factory class for creating MojoRendererImpl. |
| 15 class MEDIA_EXPORT MojoRendererFactory : public RendererFactory { | 16 class MEDIA_EXPORT MojoRendererFactory : public RendererFactory { |
| 16 public: | 17 public: |
| 17 MojoRendererFactory(mojo::ServiceProviderPtr renderer_service_provider); | 18 class ServiceProvider { |
|
jamesr
2014/12/16 01:47:37
comment?
xhwang
2014/12/16 05:05:11
Done.
| |
| 19 public: | |
| 20 ServiceProvider(){}; | |
|
jamesr
2014/12/16 01:47:37
no ;, spacing seems odd. did you run 'git cl forma
xhwang
2014/12/16 05:05:11
Yep, done by git cl format. Fixed manually.
| |
| 21 virtual ~ServiceProvider(){}; | |
| 22 virtual void ConnectToService( | |
| 23 mojo::InterfacePtr<mojo::MediaRenderer>* media_renderer_ptr) = 0; | |
| 24 | |
| 25 private: | |
| 26 DISALLOW_COPY_AND_ASSIGN(ServiceProvider); | |
| 27 }; | |
| 28 | |
| 29 MojoRendererFactory(scoped_ptr<ServiceProvider> service_provider); | |
|
jamesr
2014/12/16 01:47:37
explicit
xhwang
2014/12/16 05:05:11
Done.
| |
| 18 ~MojoRendererFactory() final; | 30 ~MojoRendererFactory() final; |
| 19 | 31 |
| 20 scoped_ptr<Renderer> CreateRenderer( | 32 scoped_ptr<Renderer> CreateRenderer( |
| 21 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, | 33 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| 22 AudioRendererSink* audio_renderer_sink) final; | 34 AudioRendererSink* audio_renderer_sink) final; |
| 23 | 35 |
| 24 private: | 36 private: |
| 25 mojo::ServiceProviderPtr renderer_service_provider_; | 37 scoped_ptr<ServiceProvider> service_provider_; |
| 26 | 38 |
| 27 DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory); | 39 DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory); |
| 28 }; | 40 }; |
| 29 | 41 |
| 30 } // namespace media | 42 } // namespace media |
| 31 | 43 |
| 32 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ | 44 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ |
| OLD | NEW |