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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/android/browser_media_player_manager.h

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 10 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
« chrome/browser/media/encrypted_media_message_filter_android.cc ('K') | « chrome/renderer/media/chrome_key_systems.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | content/browser/media/android/browser_media_player_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 9209114483b2110157239e179a63d326676297fc..8df9945d2eec6e1bbbf2faa22603accf007f8586 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -137,7 +137,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
virtual void OnDestroyPlayer(int player_id);
virtual void ReleaseFullscreenPlayer(media::MediaPlayerAndroid* player);
void OnInitializeCdm(int cdm_id,
- const std::vector<uint8>& uuid,
+ const std::string& key_system,
const GURL& frame_url);
void OnCreateSession(int cdm_id,
uint32 session_id,
@@ -171,10 +171,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
int player_id,
media::MediaPlayerAndroid* player);
- // Adds a new MediaDrmBridge for the given |uuid|, |cdm_id|, and
+ // Adds a new MediaDrmBridge for the given |key_system|, |cdm_id|, and
// |frame_url|.
void AddDrmBridge(int cdm_id,
- const std::vector<uint8>& uuid,
+ const std::string& key_system,
const GURL& frame_url);
// Removes the DRM bridge with the specified id.
« chrome/browser/media/encrypted_media_message_filter_android.cc ('K') | « chrome/renderer/media/chrome_key_systems.cc ('k') | content/browser/media/android/browser_media_player_manager.cc » ('j') | content/browser/media/android/browser_media_player_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698