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 14535e0d8ca775989d8c1bcbcded30b14dec9def..1d320b18f6daef9a92396aabfe6fd8f6796bece0 100644 |
--- a/content/renderer/media/crypto/proxy_decryptor.h |
+++ b/content/renderer/media/crypto/proxy_decryptor.h |
@@ -59,7 +59,6 @@ class ProxyDecryptor { |
const CreatePepperCdmCB& create_pepper_cdm_cb, |
#elif defined(OS_ANDROID) |
RendererMediaPlayerManager* manager, |
- int cdm_id, |
#endif // defined(ENABLE_PEPPER_CDMS) |
const KeyAddedCB& key_added_cb, |
const KeyErrorCB& key_error_cb, |
@@ -70,6 +69,10 @@ class ProxyDecryptor { |
// Decryptor is associated. |
media::Decryptor* GetDecryptor(); |
+ // Returns the CDM ID associated with this object. May be kInvalidCdmId if no |
ddorwin
2014/03/26 19:25:59
Should this be ifdef'd?
xhwang
2014/03/27 19:07:42
Done.
|
+ // CDM ID is associated. |
ddorwin
2014/03/26 19:25:59
I meant we might add something like:
", such as wh
xhwang
2014/03/27 19:07:42
Done.
|
+ int GetCdmId(); |
+ |
// Only call this once. |
bool InitializeCDM(const std::string& key_system, const GURL& frame_url); |