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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.h

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
Index: content/renderer/pepper/content_decryptor_delegate.h
diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h
index f9854653ab24cfdf706c71161589a09ed5d39f3c..0482a940042715def70584302d7557665e11c1bf 100644
--- a/content/renderer/pepper/content_decryptor_delegate.h
+++ b/content/renderer/pepper/content_decryptor_delegate.h
@@ -22,8 +22,8 @@
#include "media/base/cdm_promise_adapter.h"
#include "media/base/cdm_session_tracker.h"
#include "media/base/channel_layout.h"
+#include "media/base/content_decryption_module.h"
#include "media/base/decryptor.h"
-#include "media/base/media_keys.h"
#include "media/base/sample_format.h"
#include "ppapi/c/pp_time.h"
#include "ppapi/c/private/pp_content_decryptor.h"
@@ -68,11 +68,11 @@ class ContentDecryptorDelegate {
void SetServerCertificate(const std::vector<uint8_t>& certificate,
std::unique_ptr<media::SimpleCdmPromise> promise);
void CreateSessionAndGenerateRequest(
- media::MediaKeys::SessionType session_type,
+ media::ContentDecryptionModule::SessionType session_type,
media::EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
std::unique_ptr<media::NewSessionCdmPromise> promise);
- void LoadSession(media::MediaKeys::SessionType session_type,
+ void LoadSession(media::ContentDecryptionModule::SessionType session_type,
const std::string& session_id,
std::unique_ptr<media::NewSessionCdmPromise> promise);
void UpdateSession(const std::string& session_id,
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.cc ('k') | content/renderer/pepper/content_decryptor_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698