Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ | 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ |
| 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ | 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 const std::vector<uint8>& init_data); | 146 const std::vector<uint8>& init_data); |
| 147 void OnUpdateSession(int media_keys_id, | 147 void OnUpdateSession(int media_keys_id, |
| 148 uint32 session_id, | 148 uint32 session_id, |
| 149 const std::vector<uint8>& response); | 149 const std::vector<uint8>& response); |
| 150 void OnReleaseSession(int media_keys_id, uint32 session_id); | 150 void OnReleaseSession(int media_keys_id, uint32 session_id); |
| 151 void OnSetMediaKeys(int player_id, int media_keys_id); | 151 void OnSetMediaKeys(int player_id, int media_keys_id); |
| 152 | 152 |
| 153 void OnCancelAllPendingSessionCreations(int media_keys_id); | 153 void OnCancelAllPendingSessionCreations(int media_keys_id); |
| 154 | 154 |
| 155 #if defined(VIDEO_HOLE) | 155 #if defined(VIDEO_HOLE) |
| 156 void ReleaseExternalVideoSurface(int player_id); | |
|
boliu
2014/01/24 21:56:32
should be private
ycheo (away)
2014/01/28 13:08:53
Done.
| |
| 156 virtual void OnNotifyExternalSurface( | 157 virtual void OnNotifyExternalSurface( |
| 157 int player_id, bool is_request, const gfx::RectF& rect); | 158 int player_id, bool is_request, const gfx::RectF& rect); |
| 158 #endif // defined(VIDEO_HOLE) | 159 #endif // defined(VIDEO_HOLE) |
| 159 | 160 |
| 160 // Adds a given player to the list. | 161 // Adds a given player to the list. |
| 161 void AddPlayer(media::MediaPlayerAndroid* player); | 162 void AddPlayer(media::MediaPlayerAndroid* player); |
| 162 | 163 |
| 163 // Removes the player with the specified id. | 164 // Removes the player with the specified id. |
| 164 void RemovePlayer(int player_id); | 165 void RemovePlayer(int player_id); |
| 165 | 166 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; | 238 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; |
| 238 | 239 |
| 239 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; | 240 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; |
| 240 | 241 |
| 241 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); | 242 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); |
| 242 }; | 243 }; |
| 243 | 244 |
| 244 } // namespace content | 245 } // namespace content |
| 245 | 246 |
| 246 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ | 247 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ |
| OLD | NEW |