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..d96b1e901cae4f3a41b7c8d6f1183ac6976000e1 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,16 @@ 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); |
+ // If |permitted| is false, it does nothing but send |
+ // |MediaKeysMsg_SessionError| IPC message. |
+ // The primary use case is info bar permission callback, i.e., when info bar |
ddorwin
2014/01/07 19:07:14
nit: "info bar"
Kibeom Kim (inactive)
2014/01/07 19:31:24
Done.
|
+ // can decide user's intention either from interacting with the actual info |
ddorwin
2014/01/07 19:07:14
nit: extra space after "either".
Kibeom Kim (inactive)
2014/01/07 19:31:24
Done.
|
+ // bar or from the saved preference. |
+ void CreateSessionIfPermitted(int media_keys_id, |
+ 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. |