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

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

Issue 276973005: BrowserMediaPlayerManager manages MediaKeys objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed 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
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3969652713e9cc1eddc96f2ebf700efe3a2b29ae..158e520c54f5f11941e81df9bb261ab7c41418f6 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,8 +31,8 @@ GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
return GURL();
}
-void MediaPlayerAndroid::SetDrmBridge(MediaDrmBridge* drm_bridge) {
- // Not all players support DrmBridge. Do nothing by default.
+void MediaPlayerAndroid::SetCdm(MediaKeys* cdm) {
+ // Not all players support CDMs. Do nothing by default.
return;
}
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698