media/cdm/ppapi/external_clear_key/clear_key_cdm.h - Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.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:

Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

index 42ffb8bd415a277805472e9575a47e46a679497f..a16559deb6905448d72600cc5b93b0b6cdad39e8 100644

--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h

@@ -40,7 +40,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

ClearKeyCdm(Host* host, const std::string& key_system, const GURL& origin);

~ClearKeyCdm() override;

- // ContentDecryptionModule implementation.

+ // ClearKeyCdmInterface implementation.

void Initialize(bool allow_distinctive_identifier,

bool allow_persistent_state) override;

void CreateSessionAndGenerateRequest(uint32_t promise_id,

@@ -94,7 +94,7 @@ class ClearKeyCdm : public ClearKeyCdmInterface {

// ContentDecryptionModule callbacks.

void OnSessionMessage(const std::string& session_id,

- MediaKeys::MessageType message_type,

+ ContentDecryptionModule::MessageType message_type,

const std::vector<uint8_t>& message);

void OnSessionKeysChange(const std::string& session_id,

bool has_additional_usable_key,