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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review 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/webmediaplayer_android.cc ('K') | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/crypto/content_decryption_module_factory.cc » ('j') | content/renderer/render_frame_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/content_decryption_module_factory.h
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.h b/content/renderer/media/crypto/content_decryption_module_factory.h
index d7d8269b13b7be36ba9a59ebf39fbf804b56aaa7..805a11eb82a38f0ebd18f77cdddee46cda8edabc 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.h
+++ b/content/renderer/media/crypto/content_decryption_module_factory.h
@@ -18,7 +18,7 @@ class GURL;
namespace content {
-class RendererMediaPlayerManager;
+class RendererCdmManager;
class ContentDecryptionModuleFactory {
public:
@@ -30,7 +30,7 @@ class ContentDecryptionModuleFactory {
#if defined(ENABLE_PEPPER_CDMS)
const CreatePepperCdmCB& create_pepper_cdm_cb,
#elif defined(OS_ANDROID)
- RendererMediaPlayerManager* manager,
+ RendererCdmManager* manager,
ddorwin 2014/05/23 23:28:37 Step n: Unify these parameters? :)
xhwang 2014/05/27 22:57:41 n++ :)
int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.
#endif // defined(ENABLE_PEPPER_CDMS)
const media::SessionCreatedCB& session_created_cb,
« content/renderer/media/android/webmediaplayer_android.cc ('K') | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/crypto/content_decryption_module_factory.cc » ('j') | content/renderer/render_frame_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698