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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/crypto/proxy_decryptor.h

Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 6 years, 7 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
« content/renderer/media/android/proxy_media_keys.cc ('K') | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/proxy_decryptor.cc » ('j') | content/renderer/media/crypto/renderer_cdm_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2919ef7c71a6c40aa5ead019974f6279af9f5f89..51b95bb28ab197040ba1b73e9e17ea19c9eba5e3 100644
--- a/content/renderer/media/crypto/proxy_decryptor.h
+++ b/content/renderer/media/crypto/proxy_decryptor.h
@@ -26,7 +26,7 @@ class GURL;
namespace content {
#if defined(OS_ANDROID)
-class RendererMediaPlayerManager;
+class RendererCdmManager;
#endif // defined(OS_ANDROID)
// ProxyDecryptor is for EME v0.1b only. It should not be used for the WD API.
@@ -58,7 +58,7 @@ class ProxyDecryptor {
#if defined(ENABLE_PEPPER_CDMS)
const CreatePepperCdmCB& create_pepper_cdm_cb,
#elif defined(OS_ANDROID)
- RendererMediaPlayerManager* manager,
+ RendererCdmManager* manager,
#endif // defined(ENABLE_PEPPER_CDMS)
const KeyAddedCB& key_added_cb,
const KeyErrorCB& key_error_cb,
@@ -119,7 +119,7 @@ class ProxyDecryptor {
// Callback to create the Pepper plugin.
CreatePepperCdmCB create_pepper_cdm_cb_;
#elif defined(OS_ANDROID)
- RendererMediaPlayerManager* manager_;
+ RendererCdmManager* manager_;
int cdm_id_;
#endif // defined(ENABLE_PEPPER_CDMS)
« content/renderer/media/android/proxy_media_keys.cc ('K') | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/proxy_decryptor.cc » ('j') | content/renderer/media/crypto/renderer_cdm_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698