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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 const std::vector<uint8>& uuid, | 136 const std::vector<uint8>& uuid, |
| 137 const GURL& frame_url); | 137 const GURL& frame_url); |
| 138 void OnCreateSession(int media_keys_id, | 138 void OnCreateSession(int media_keys_id, |
| 139 uint32 session_id, | 139 uint32 session_id, |
| 140 const std::string& type, | 140 const std::string& type, |
| 141 const std::vector<uint8>& init_data); | 141 const std::vector<uint8>& init_data); |
| 142 void OnUpdateSession(int media_keys_id, | 142 void OnUpdateSession(int media_keys_id, |
| 143 uint32 session_id, | 143 uint32 session_id, |
| 144 const std::vector<uint8>& response); | 144 const std::vector<uint8>& response); |
| 145 void OnReleaseSession(int media_keys_id, uint32 session_id); | 145 void OnReleaseSession(int media_keys_id, uint32 session_id); |
| 146 void OnCancelSession(int media_keys_id, uint32 session_id); | |
|
ddorwin
2013/12/20 23:59:52
These other *Session methods all have spec equival
Kibeom Kim (inactive)
2013/12/30 12:33:05
Done.
| |
| 146 void OnSetMediaKeys(int player_id, int media_keys_id); | 147 void OnSetMediaKeys(int player_id, int media_keys_id); |
| 147 | 148 |
| 148 #if defined(VIDEO_HOLE) | 149 #if defined(VIDEO_HOLE) |
| 149 virtual void OnNotifyExternalSurface( | 150 virtual void OnNotifyExternalSurface( |
| 150 int player_id, bool is_request, const gfx::RectF& rect); | 151 int player_id, bool is_request, const gfx::RectF& rect); |
| 151 #endif // defined(VIDEO_HOLE) | 152 #endif // defined(VIDEO_HOLE) |
| 152 | 153 |
| 153 // Adds a given player to the list. | 154 // Adds a given player to the list. |
| 154 void AddPlayer(media::MediaPlayerAndroid* player); | 155 void AddPlayer(media::MediaPlayerAndroid* player); |
| 155 | 156 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; | 229 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; |
| 229 | 230 |
| 230 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; | 231 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; |
| 231 | 232 |
| 232 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); | 233 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); |
| 233 }; | 234 }; |
| 234 | 235 |
| 235 } // namespace content | 236 } // namespace content |
| 236 | 237 |
| 237 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ | 238 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ |
| OLD | NEW |