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

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

Patch Set: Fix compile error on Windows 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.cc

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

index 82d6b0f6d85540a816a4186d3c041c07e0f3fb36..8af9dfe6331e3cdee30142a42f6222bde8bd4dc1 100644

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

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

@@ -24,7 +24,7 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(

#if defined(ENABLE_PEPPER_CDMS)

const CreatePepperCdmCB& create_pepper_cdm_cb,

#elif defined(OS_ANDROID)

- RendererMediaPlayerManager* manager,

+ RendererCdmManager* manager,

int* cdm_id,

#endif // defined(ENABLE_PEPPER_CDMS)

const media::SessionCreatedCB& session_created_cb,