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

Unified Diff: media/base/android/media_player_manager.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
Index: media/base/android/media_player_manager.h
diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h
index c7c996aa67b1e88efa80eaf9093e73053903b52a..e82ac1afb3d3f4776e7a1c96182cfb6bbe304bc9 100644
--- a/media/base/android/media_player_manager.h
+++ b/media/base/android/media_player_manager.h
@@ -19,7 +19,7 @@ class GURL;
namespace media {
-class MediaKeys;
+class MediaDrmBridge;
class MediaPlayerAndroid;
class MediaResourceGetter;
@@ -75,7 +75,7 @@ class MEDIA_EXPORT MediaPlayerManager {
virtual void DestroyAllMediaPlayers() = 0;
// Get the CDM for the given CDM ID.
- virtual MediaKeys* GetCdm(int cdm_id) = 0;
+ virtual MediaDrmBridge* GetCdm(int cdm_id) = 0;
// Called by the player to get a hardware protected surface.
virtual void RequestFullScreen(int player_id) = 0;

Powered by Google App Engine
This is Rietveld 408576698