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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/android/media_player_android.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 2 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 | « media/base/android/media_drm_bridge_unittest.cc ('k') | media/base/android/media_player_android.cc » ('j') | media/base/media_keys.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_player_android.h
diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
index e24ad6c87448cce2e404bf9fecf9a3cd7c7807db..24fb599b077c8c4551f6b508b6ee905fd933dc72 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -19,7 +19,7 @@
namespace media {
-class BrowserCdm;
+class MediaKeys;
class MediaPlayerManager;
// This class serves as the base class for different media player
@@ -78,7 +78,7 @@ class MEDIA_EXPORT MediaPlayerAndroid {
virtual GURL GetFirstPartyForCookies();
// Associates the |cdm| with this player.
- virtual void SetCdm(BrowserCdm* cdm);
+ virtual void SetCdm(const scoped_refptr<MediaKeys>& cdm);
// Requests playback permission from MediaPlayerManager.
// Overridden in MediaCodecPlayer to pass data between threads.
« no previous file with comments | « media/base/android/media_drm_bridge_unittest.cc ('k') | media/base/android/media_player_android.cc » ('j') | media/base/media_keys.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698