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

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: 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
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/media/cdm_session_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b05ebe3c291eddedd70b366993983d5175f7fa42..de27125db156589bf3a1109ae40c7bc2c383aeda 100644
--- a/content/renderer/media/cdm_session_adapter.h
+++ b/content/renderer/media/cdm_session_adapter.h
@@ -23,9 +23,10 @@ class GURL;
namespace content {
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
class RendererCdmManager;
#endif
+
class WebContentDecryptionModuleSessionImpl;
// Owns the CDM instance and makes calls from session objects to the CDM.
@@ -40,7 +41,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,
@@ -87,7 +88,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;
@@ -120,7 +121,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
SessionMap sessions_;
-#if defined(OS_ANDROID)
+#if defined(ENABLE_BROWSER_CDMS)
int cdm_id_;
#endif
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/media/cdm_session_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698