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

Unified Diff: media/blink/webcontentdecryptionmodule_impl.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 years 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/blink/webcontentdecryptionmodule_impl.h ('k') | media/blink/webcontentdecryptionmodulesession_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webcontentdecryptionmodule_impl.cc
diff --git a/media/blink/webcontentdecryptionmodule_impl.cc b/media/blink/webcontentdecryptionmodule_impl.cc
index d6974c8b9005e2e351e9b792e954213277cb4466..2daa4226c1e201dabdded94164ff799a2101946e 100644
--- a/media/blink/webcontentdecryptionmodule_impl.cc
+++ b/media/blink/webcontentdecryptionmodule_impl.cc
@@ -12,8 +12,8 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "media/base/cdm_promise.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/key_systems.h"
-#include "media/base/media_keys.h"
#include "media/blink/cdm_result_promise.h"
#include "media/blink/cdm_session_adapter.h"
#include "media/blink/webcontentdecryptionmodulesession_impl.h"
@@ -101,7 +101,8 @@ void WebContentDecryptionModuleImpl::setServerCertificate(
new CdmResultPromise<>(result, std::string())));
}
-scoped_refptr<MediaKeys> WebContentDecryptionModuleImpl::GetCdm() {
+scoped_refptr<ContentDecryptionModule>
+WebContentDecryptionModuleImpl::GetCdm() {
return adapter_->GetCdm();
}
« no previous file with comments | « media/blink/webcontentdecryptionmodule_impl.h ('k') | media/blink/webcontentdecryptionmodulesession_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698