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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes 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
« media/base/android/cdm_factory_android.cc ('K') | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_player_android.cc » ('j') | media/base/cdm_promise.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 cf67bd03a73bba35d91014056f187f9b77bfaa30..0758ce890194e42cb171f8c4d3b35b01a21b1dde 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -16,7 +16,7 @@
namespace media {
-class MediaKeys;
+class MediaDrmBridge;
class MediaPlayerManager;
// This class serves as the base class for different media player
@@ -74,7 +74,7 @@ class MEDIA_EXPORT MediaPlayerAndroid {
virtual GURL GetFirstPartyForCookies();
// Associates the |cdm| with this player.
- virtual void SetCdm(MediaKeys* cdm);
+ virtual void SetCdm(MediaDrmBridge* cdm);
// Notifies the player that a decryption key has been added. The player
// may want to start/resume playback if it is waiting for a key.
« media/base/android/cdm_factory_android.cc ('K') | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_player_android.cc » ('j') | media/base/cdm_promise.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698