content/renderer/media/crypto/content_decryption_module_factory.h - Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager.

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: content/renderer/media/crypto/content_decryption_module_factory.h

Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 6 years, 7 months 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: content/renderer/media/crypto/content_decryption_module_factory.h

diff --git a/content/renderer/media/crypto/content_decryption_module_factory.h b/content/renderer/media/crypto/content_decryption_module_factory.h

index d7d8269b13b7be36ba9a59ebf39fbf804b56aaa7..805a11eb82a38f0ebd18f77cdddee46cda8edabc 100644

--- a/content/renderer/media/crypto/content_decryption_module_factory.h

+++ b/content/renderer/media/crypto/content_decryption_module_factory.h

@@ -18,7 +18,7 @@ class GURL;

namespace content {

-class RendererMediaPlayerManager;

+class RendererCdmManager;

class ContentDecryptionModuleFactory {

public:

@@ -30,7 +30,7 @@ class ContentDecryptionModuleFactory {

#if defined(ENABLE_PEPPER_CDMS)

const CreatePepperCdmCB& create_pepper_cdm_cb,

#elif defined(OS_ANDROID)

- RendererMediaPlayerManager* manager,

+ RendererCdmManager* manager,

int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.

#endif // defined(ENABLE_PEPPER_CDMS)

const media::SessionCreatedCB& session_created_cb,