content/renderer/media/crypto/content_decryption_module_factory.cc - Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro.

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 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ready for review. Please diff against PS1 for easy life. Created 6 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« content/renderer/media/cdm_session_adapter.h ('K') | « content/renderer/media/crypto/content_decryption_module_factory.h ('k') | content/renderer/media/crypto/proxy_decryptor.h » ('j') | content/renderer/media/webcontentdecryptionmodule_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 159e7f181bf137f84d3ac6081f1fe379994a7847..a6669bf473ea1ab97e78ac98c1c560ddbda3d92d 100644

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

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

@@ -11,7 +11,7 @@

#if defined(ENABLE_PEPPER_CDMS)

#include "content/renderer/media/crypto/ppapi_decryptor.h"

-#elif defined(OS_ANDROID)

+#elif defined(ENABLE_BROWSER_CDMS)

#include "content/renderer/media/crypto/proxy_media_keys.h"

#include "content/renderer/media/crypto/renderer_cdm_manager.h"

#endif // defined(ENABLE_PEPPER_CDMS)

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

const GURL& security_origin,

#if defined(ENABLE_PEPPER_CDMS)

const CreatePepperCdmCB& create_pepper_cdm_cb,

-#elif defined(OS_ANDROID)

+#elif defined(ENABLE_BROWSER_CDMS)

RendererCdmManager* manager,

int* cdm_id,

#endif // defined(ENABLE_PEPPER_CDMS)

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

// check the security origin before calling.

// DCHECK(security_origin.is_valid());

-#if defined(OS_ANDROID)

+#if defined(ENABLE_BROWSER_CDMS)

*cdm_id = RendererCdmManager::kInvalidCdmId;

#endif

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

session_ready_cb,

session_closed_cb,

session_error_cb));

-#elif defined(OS_ANDROID)

+#elif defined(ENABLE_BROWSER_CDMS)

scoped_ptr<ProxyMediaKeys> proxy_media_keys =

ProxyMediaKeys::Create(key_system,

security_origin,