Index: media/mojo/services/mojo_renderer_service.h |
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h |
index 58b1ce7bd4806cdba3b30846699f1edb7f17e4f0..fb108738424572458b7d2a30cebf48a268f155dc 100644 |
--- a/media/mojo/services/mojo_renderer_service.h |
+++ b/media/mojo/services/mojo_renderer_service.h |
@@ -9,6 +9,7 @@ |
#include <memory> |
+#include "base/callback.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/weak_ptr.h" |
@@ -44,12 +45,12 @@ class MEDIA_MOJO_EXPORT MojoRendererService : public mojom::Renderer, |
void Initialize(mojom::RendererClientPtr client, |
mojom::DemuxerStreamPtr audio, |
mojom::DemuxerStreamPtr video, |
- const mojo::Callback<void(bool)>& callback) final; |
- void Flush(const mojo::Closure& callback) final; |
+ const InitializeCallback& callback) final; |
+ void Flush(const FlushCallback& callback) final; |
void StartPlayingFrom(int64_t time_delta_usec) final; |
void SetPlaybackRate(double playback_rate) final; |
void SetVolume(float volume) final; |
- void SetCdm(int32_t cdm_id, const mojo::Callback<void(bool)>& callback) final; |
+ void SetCdm(int32_t cdm_id, const SetCdmCallback& callback) final; |
private: |
enum State { |
@@ -71,10 +72,10 @@ class MEDIA_MOJO_EXPORT MojoRendererService : public mojom::Renderer, |
// Called when the DemuxerStreamProviderShim is ready to go (has a config, |
// pipe handle, etc) and can be handed off to a renderer for use. |
- void OnStreamReady(const mojo::Callback<void(bool)>& callback); |
+ void OnStreamReady(const base::Callback<void(bool)>& callback); |
// Called when |audio_renderer_| initialization has completed. |
- void OnRendererInitializeDone(const mojo::Callback<void(bool)>& callback, |
+ void OnRendererInitializeDone(const base::Callback<void(bool)>& callback, |
PipelineStatus status); |
// Periodically polls the media time from the renderer and notifies the client |
@@ -85,11 +86,11 @@ class MEDIA_MOJO_EXPORT MojoRendererService : public mojom::Renderer, |
void SchedulePeriodicMediaTimeUpdates(); |
// Callback executed once Flush() completes. |
- void OnFlushCompleted(const mojo::Closure& callback); |
+ void OnFlushCompleted(const FlushCallback& callback); |
// Callback executed once SetCdm() completes. |
void OnCdmAttached(scoped_refptr<MediaKeys> cdm, |
- const mojo::Callback<void(bool)>& callback, |
+ const base::Callback<void(bool)>& callback, |
bool success); |
mojo::StrongBinding<mojom::Renderer> binding_; |