media/mojo/services/mojo_cdm_service_context.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/mojo/services/mojo_cdm_service_context.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/mojo/services/mojo_cdm_service_context.h

diff --git a/media/mojo/services/mojo_cdm_service_context.h b/media/mojo/services/mojo_cdm_service_context.h

index 5938e9fcd55452d10e74123dcd79f96c4bdf0b30..076c4d6db413b9d459cc9720a024fe13698ee933 100644

--- a/media/mojo/services/mojo_cdm_service_context.h

+++ b/media/mojo/services/mojo_cdm_service_context.h

@@ -16,7 +16,7 @@

namespace media {

-class MediaKeys;

+class ContentDecryptionModule;

class MojoCdmService;

// A class that creates, owns and manages all MojoCdmService instances.

@@ -34,7 +34,7 @@ class MEDIA_MOJO_EXPORT MojoCdmServiceContext {

void UnregisterCdm(int cdm_id);

// Returns the CDM associated with |cdm_id|.

- scoped_refptr<MediaKeys> GetCdm(int cdm_id);

+ scoped_refptr<ContentDecryptionModule> GetCdm(int cdm_id);

private:

// A map between CDM ID and MojoCdmService.