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

Unified Diff: content/renderer/media/crypto/proxy_decryptor.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/crypto/proxy_decryptor.h
diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h
index 98bfbb1d2b84b2270064718f74e5a99b066d997e..e4fd7eace5e7fb2574acb546eedb6ff8b02b136d 100644
--- a/content/renderer/media/crypto/proxy_decryptor.h
+++ b/content/renderer/media/crypto/proxy_decryptor.h
@@ -23,9 +23,9 @@ class GURL;
namespace content {
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
class RendererCdmManager;
-#endif // defined(OS_ANDROID)
+#endif // defined(ENABLE_BROWSER_CDMS)
// ProxyDecryptor is for EME v0.1b only. It should not be used for the WD API.
// A decryptor proxy that creates a real decryptor object on demand and
@@ -49,7 +49,7 @@ class ProxyDecryptor {
ProxyDecryptor(
#if defined(ENABLE_PEPPER_CDMS)
const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(OS_ANDROID)
+#elif defined(ENABLE_BROWSER_CDMS)
RendererCdmManager* manager,
#endif // defined(ENABLE_PEPPER_CDMS)
const KeyAddedCB& key_added_cb,
@@ -61,7 +61,7 @@ class ProxyDecryptor {
// Decryptor is associated.
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();
@@ -102,7 +102,7 @@ class ProxyDecryptor {
#if defined(ENABLE_PEPPER_CDMS)
// Callback to create the Pepper plugin.
CreatePepperCdmCB create_pepper_cdm_cb_;
-#elif defined(OS_ANDROID)
+#elif defined(ENABLE_BROWSER_CDMS)
RendererCdmManager* manager_;
int cdm_id_;
#endif // defined(ENABLE_PEPPER_CDMS)
« no previous file with comments | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698