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

Unified Diff: media/blink/webcontentdecryptionmodulesession_impl.h

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: 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
Index: media/blink/webcontentdecryptionmodulesession_impl.h
diff --git a/media/blink/webcontentdecryptionmodulesession_impl.h b/media/blink/webcontentdecryptionmodulesession_impl.h
index 8af796ccf4134f9df6a608fe901c3a73f15d26ab..0a41647e9c7e4cea54bdc78ba2eac48bb64cbdaa 100644
--- a/media/blink/webcontentdecryptionmodulesession_impl.h
+++ b/media/blink/webcontentdecryptionmodulesession_impl.h
@@ -16,7 +16,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
-#include "media/base/media_keys.h"
+#include "media/base/content_decryption_module.h"
#include "media/blink/new_session_cdm_result_promise.h"
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -24,7 +24,7 @@
namespace media {
class CdmSessionAdapter;
-class MediaKeys;
+class ContentDecryptionModule;
jrummell 2016/12/12 22:08:40 nit: Not needed as content_decryption_module.h is
xhwang 2016/12/12 22:32:50 Done.
class WebContentDecryptionModuleSessionImpl
: public blink::WebContentDecryptionModuleSession {
@@ -52,7 +52,7 @@ class WebContentDecryptionModuleSessionImpl
void remove(blink::WebContentDecryptionModuleResult result) override;
// Callbacks.
- void OnSessionMessage(MediaKeys::MessageType message_type,
+ void OnSessionMessage(ContentDecryptionModule::MessageType message_type,
const std::vector<uint8_t>& message);
void OnSessionKeysChange(bool has_additional_usable_key,
CdmKeysInfo keys_info);

Powered by Google App Engine
This is Rietveld 408576698