Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: content/renderer/media/webcontentdecryptionmodule_impl.h

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MEDIA_EXPORT 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
Index: content/renderer/media/webcontentdecryptionmodule_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index 152f962c18ba6ad10f0b566b5ca7bba4c307d8b4..871ca27f4a98432cf3d5ae9c838b81b483832416 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -27,7 +27,7 @@ class MediaKeys;
namespace content {
class CdmSessionAdapter;
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
class RendererCdmManager;
#endif
class WebContentDecryptionModuleSessionImpl;
@@ -38,7 +38,7 @@ class WebContentDecryptionModuleImpl
static WebContentDecryptionModuleImpl* Create(
#if defined(ENABLE_PEPPER_CDMS)
blink::WebLocalFrame* frame,
-#elif defined(OS_ANDROID)
+#elif defined(ENABLE_BROWSER_CDMS)
RendererCdmManager* manager,
#endif
const blink::WebSecurityOrigin& security_origin,
@@ -52,11 +52,11 @@ class WebContentDecryptionModuleImpl
// after WebContentDecryptionModule is freed. http://crbug.com/330324
media::Decryptor* GetDecryptor();
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
// Returns the CDM ID associated with this object. May be kInvalidCdmId if no
// CDM ID is associated, such as when Clear Key is used.
int GetCdmId() const;
-#endif // defined(OS_ANDROID)
+#endif // defined(ENABLE_BROWSER_CDMS)
// blink::WebContentDecryptionModule implementation.
virtual blink::WebContentDecryptionModuleSession* createSession(
« no previous file with comments | « content/renderer/media/crypto/proxy_decryptor.cc ('k') | content/renderer/media/webcontentdecryptionmodule_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698