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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 276973005: BrowserMediaPlayerManager manages MediaKeys objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MEDIA_EXPORT 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_drm_bridge.cc ('k') | media/base/android/media_player_android.cc » ('j') | media/base/android/media_player_manager.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 0fd481517c18827bbbb0d8a72a56933af81c7f35..7af24ddfff632013c2b0033bed2a420ffbb937bc 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -16,7 +16,7 @@
namespace media {
-class MediaDrmBridge;
+class MediaKeys;
class MediaPlayerManager;
// This class serves as the base class for different media player
@@ -73,8 +73,8 @@ class MEDIA_EXPORT MediaPlayerAndroid {
virtual GURL GetUrl();
virtual GURL GetFirstPartyForCookies();
- // Pass a drm bridge to a player.
- virtual void SetDrmBridge(MediaDrmBridge* drm_bridge);
+ // Pass a CDM to a player.
ddorwin 2014/05/13 00:59:38 s/Pass/Provide/ (or attach or associate with).
xhwang 2014/05/14 16:42:06 Done.
+ virtual void SetCdm(MediaKeys* 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/media_drm_bridge.cc ('K') | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_player_android.cc » ('j') | media/base/android/media_player_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698