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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 308073004: Add PlayerTracker and BrowserCdm interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix 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/media_drm_bridge.cc ('K') | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | media/base/android/media_source_player.cc » ('J')
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 158e520c54f5f11941e81df9bb261ab7c41418f6..2e86dafef9c2db4386d22ada2fa13dc1409ae631 100644
--- a/media/base/android/media_player_android.cc
+++ b/media/base/android/media_player_android.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "media/base/android/media_player_manager.h"
-#include "media/base/media_keys.h"
namespace media {
@@ -31,14 +30,9 @@ GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
return GURL();
}
-void MediaPlayerAndroid::SetCdm(MediaKeys* cdm) {
+void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) {
// Not all players support CDMs. Do nothing by default.
ddorwin 2014/05/30 20:50:05 Shouldn't this either be impossible (DCHECK) or ca
xhwang 2014/06/02 20:11:43 Done.
return;
}
-void MediaPlayerAndroid::OnKeyAdded() {
- // Not all players care about the decryption key. Do nothing by default.
- return;
-}
-
} // namespace media
« media/base/android/media_drm_bridge.cc ('K') | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | media/base/android/media_source_player.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698