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

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

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_android.cc
diff --git a/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc
index 158e520c54f5f11941e81df9bb261ab7c41418f6..e451c3ca5bc1a55f77d90716b42c2e2b1ad7795b 100644
--- a/media/base/android/media_player_android.cc
+++ b/media/base/android/media_player_android.cc
@@ -5,8 +5,8 @@
#include "media/base/android/media_player_android.h"
#include "base/logging.h"
+#include "media/base/android/media_drm_bridge.h"
#include "media/base/android/media_player_manager.h"
-#include "media/base/media_keys.h"
namespace media {
@@ -31,7 +31,7 @@ GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
return GURL();
}
-void MediaPlayerAndroid::SetCdm(MediaKeys* cdm) {
+void MediaPlayerAndroid::SetCdm(MediaDrmBridge* cdm) {
// Not all players support CDMs. Do nothing by default.
return;
}

Powered by Google App Engine
This is Rietveld 408576698