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 7813d92e5eac9b040f845975f0535c398e3fb88d..5f54a5f4540e15184c05e8b144a5dde8d537fc4b 100644 |
--- a/content/browser/media/android/browser_media_player_manager.h |
+++ b/content/browser/media/android/browser_media_player_manager.h |
@@ -150,6 +150,8 @@ class CONTENT_EXPORT BrowserMediaPlayerManager |
void OnReleaseSession(int media_keys_id, uint32 session_id); |
void OnSetMediaKeys(int player_id, int media_keys_id); |
+ void OnCancelAllPendingSessionCreations(int media_keys_id); |
+ |
#if defined(VIDEO_HOLE) |
virtual void OnNotifyExternalSurface( |
int player_id, bool is_request, const gfx::RectF& rect); |
@@ -178,11 +180,11 @@ class CONTENT_EXPORT BrowserMediaPlayerManager |
void RemoveDrmBridge(int media_keys_id); |
private: |
- void GenerateKeyIfAllowed(int media_keys_id, |
- uint32 session_id, |
- const std::string& type, |
- const std::vector<uint8>& init_data, |
- bool allowed); |
+ void CreateSessionIfPermitted(int media_keys_id, |
xhwang
2013/12/30 19:00:59
doc about what's happening if not |permitted|, and
Kibeom Kim (inactive)
2013/12/30 21:52:24
Done.
|
+ uint32 session_id, |
+ const std::string& type, |
+ const std::vector<uint8>& init_data, |
+ bool permitted); |
// Constructs a MediaPlayerAndroid object. Declared static to permit embedders |
// to override functionality. |