summaryrefslogtreecommitdiffstats
path: root/media/mojo/services/mojo_renderer_impl.cc
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2015-02-10 13:09:49 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-10 21:10:52 +0000
commit0a7a3314bd50725e8327f22afd5517e6a1325c89 (patch)
treee11612ca7ee4ab441886baf08703ec16295f2a9d /media/mojo/services/mojo_renderer_impl.cc
parent30acccac63eab05248870f11aceb2c74ee76ccea (diff)
downloadchromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.zip
chromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.tar.gz
chromium_src-0a7a3314bd50725e8327f22afd5517e6a1325c89.tar.bz2
Remove Client= from media_renderer.mojom
BUG=451321 TEST=mojo://media_test Review URL: https://codereview.chromium.org/911783002 Cr-Commit-Position: refs/heads/master@{#315639}
Diffstat (limited to 'media/mojo/services/mojo_renderer_impl.cc')
-rw-r--r--media/mojo/services/mojo_renderer_impl.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc
index bf422a3..6abed01 100644
--- a/media/mojo/services/mojo_renderer_impl.cc
+++ b/media/mojo/services/mojo_renderer_impl.cc
@@ -21,7 +21,8 @@ MojoRendererImpl::MojoRendererImpl(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
mojo::MediaRendererPtr remote_media_renderer)
: task_runner_(task_runner),
- remote_media_renderer_pipe_(remote_media_renderer.PassMessagePipe()),
+ remote_media_renderer_(remote_media_renderer.Pass()),
+ binding_(this),
weak_factory_(this) {
DVLOG(1) << __FUNCTION__;
}
@@ -45,15 +46,6 @@ void MojoRendererImpl::Initialize(
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(demuxer_stream_provider);
- // Bind the mojo InterfacePtr to the message pipe on the
- // current thread so we can use it. The MojoRendererImpl object
- // is constructed on another thread so we can't do it in the
- // constructor and must pass a message pipe around since
- // InterfacePtr's are tied to the message loop they were created on.
- remote_media_renderer_.Bind(remote_media_renderer_pipe_.Pass());
- DCHECK(remote_media_renderer_);
- remote_media_renderer_.set_client(this);
-
demuxer_stream_provider_ = demuxer_stream_provider;
init_cb_ = init_cb;
ended_cb_ = ended_cb;
@@ -79,7 +71,10 @@ void MojoRendererImpl::Initialize(
->DidConnect();
}
+ mojo::MediaRendererClientPtr client_ptr;
+ binding_.Bind(GetProxy(&client_ptr));
remote_media_renderer_->Initialize(
+ client_ptr.Pass(),
audio_stream.Pass(),
video_stream.Pass(),
BindToCurrentLoop(base::Bind(&MojoRendererImpl::OnInitialized,