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

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

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
Index: content/renderer/media/cdm_session_adapter.h
diff --git a/content/renderer/media/cdm_session_adapter.h b/content/renderer/media/cdm_session_adapter.h
index 0a3c81c69cf5d06bdcd2371c2314017ca91ae217..f79564337983ee5f859c7c8e43633d78a30b7a10 100644
--- a/content/renderer/media/cdm_session_adapter.h
+++ b/content/renderer/media/cdm_session_adapter.h
@@ -21,7 +21,7 @@ class GURL;
namespace content {
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
class RendererCdmManager;
#endif
class WebContentDecryptionModuleSessionImpl;
@@ -38,7 +38,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
bool Initialize(
#if defined(ENABLE_PEPPER_CDMS)
const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(OS_ANDROID)
+#elif defined(ENABLE_BROWSER_CDMS)
RendererCdmManager* manager,
#endif
const std::string& key_system,
@@ -73,7 +73,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
// 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 the |media_keys_|. May be kInvalidCdmId
// if no CDM ID is associated.
int GetCdmId() const;
ddorwin 2014/06/05 17:59:48 Since this has a clear purpose now, should we name
xhwang 2014/06/09 20:57:19 I tried. Actually it looks weird when you have cod
@@ -106,7 +106,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
SessionMap sessions_;
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
int cdm_id_;
#endif

Powered by Google App Engine
This is Rietveld 408576698