content/renderer/media/crypto/content_decryption_module_factory.h - Issue 193523002: Encrypted Media: Implement IPC based SetCdm().

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 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments addressed Created 6 years, 9 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 418c5e561d85942d8681f40581e6a1977dc40165..df3f34e20c80ebabfb5e4b5d59edf52117caff6b 100644

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

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

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

const CreatePepperCdmCB& create_pepper_cdm_cb,

#elif defined(OS_ANDROID)

RendererMediaPlayerManager* manager,

- int cdm_id,

const GURL& frame_url,

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

#endif // defined(ENABLE_PEPPER_CDMS)

const media::SessionCreatedCB& session_created_cb,

const media::SessionMessageCB& session_message_cb,