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

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

Issue 100323004: Update Android IPC messages to EME WD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nit Created 7 years 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: 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 cee6be58ffb908517ae8de11cac6fc137458eba5..d2df847f3ef5e33d7ff23dd30fbab34d2ddd42b4 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -92,7 +92,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
virtual void OnProtectedSurfaceRequested(int player_id) OVERRIDE;
virtual void OnSessionCreated(int media_keys_id,
uint32 reference_id,
- const std::string& session_id) OVERRIDE;
+ const std::string& web_session_id) OVERRIDE;
virtual void OnSessionMessage(int media_keys_id,
uint32 reference_id,
const std::vector<uint8>& message,
@@ -135,15 +135,14 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
void OnInitializeCDM(int media_keys_id,
const std::vector<uint8>& uuid,
const GURL& frame_url);
- void OnGenerateKeyRequest(int media_keys_id,
- uint32 reference_id,
- const std::string& type,
- const std::vector<uint8>& init_data);
- void OnAddKey(int media_keys_id,
- uint32 reference_id,
- const std::vector<uint8>& key,
- const std::vector<uint8>& init_data);
- void OnCancelKeyRequest(int media_keys_id, uint32 reference_id);
+ void OnCreateSession(int media_keys_id,
+ uint32 reference_id,
+ const std::string& type,
+ const std::vector<uint8>& init_data);
+ void OnUpdateSession(int media_keys_id,
+ uint32 reference_id,
+ const std::vector<uint8>& response);
+ void OnReleaseSession(int media_keys_id, uint32 reference_id);
void OnSetMediaKeys(int player_id, int media_keys_id);
#if defined(GOOGLE_TV)

Powered by Google App Engine
This is Rietveld 408576698