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

Unified Diff: media/mojo/services/mojo_cdm.cc

Issue 1004623009: media: Hook up ContentDecryptionModuleClient in mojo CDM service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 43dbf2d7a14daba3ba7f34877fb8908d5667183e..d228f7347d1b71eb0efb335a4313d9710e55b8e6 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -39,6 +39,7 @@ MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
const SessionKeysChangeCB& session_keys_change_cb,
const SessionExpirationUpdateCB& session_expiration_update_cb)
: remote_cdm_(remote_cdm.Pass()),
+ binding_(this),
session_message_cb_(session_message_cb),
session_closed_cb_(session_closed_cb),
session_error_cb_(session_error_cb),
@@ -52,9 +53,9 @@ MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
DCHECK(!session_keys_change_cb_.is_null());
DCHECK(!session_expiration_update_cb_.is_null());
- // TODO(xhwang): Client syntax has been removed, so a new mechanism for client
- // discovery must be added to this interface. See http://crbug.com/451321.
- NOTREACHED();
+ mojo::ContentDecryptionModuleClientPtr client_ptr;
+ binding_.Bind(GetProxy(&client_ptr));
+ remote_cdm_->SetClient(client_ptr.Pass());
xhwang 2015/03/17 23:30:37 We don't need to wait for a confirmation callaback
}
MojoCdm::~MojoCdm() {
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698