| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 virtual void OnKeyAdded(int media_keys_id, | 93 virtual void OnKeyAdded(int media_keys_id, |
| 94 const std::string& session_id) OVERRIDE; | 94 const std::string& session_id) OVERRIDE; |
| 95 virtual void OnKeyError(int media_keys_id, | 95 virtual void OnKeyError(int media_keys_id, |
| 96 const std::string& session_id, | 96 const std::string& session_id, |
| 97 media::MediaKeys::KeyError error_code, | 97 media::MediaKeys::KeyError error_code, |
| 98 int system_code) OVERRIDE; | 98 int system_code) OVERRIDE; |
| 99 virtual void OnKeyMessage(int media_keys_id, | 99 virtual void OnKeyMessage(int media_keys_id, |
| 100 const std::string& session_id, | 100 const std::string& session_id, |
| 101 const std::vector<uint8>& message, | 101 const std::vector<uint8>& message, |
| 102 const std::string& destination_url) OVERRIDE; | 102 const std::string& destination_url) OVERRIDE; |
| 103 virtual void OnMediaDecoderCallbackForTesting() OVERRIDE {} |
| 103 | 104 |
| 104 #if defined(GOOGLE_TV) | 105 #if defined(GOOGLE_TV) |
| 105 void AttachExternalVideoSurface(int player_id, jobject surface); | 106 void AttachExternalVideoSurface(int player_id, jobject surface); |
| 106 void DetachExternalVideoSurface(int player_id); | 107 void DetachExternalVideoSurface(int player_id); |
| 107 #endif | 108 #endif |
| 108 | 109 |
| 109 // Called to disble the current fullscreen playback if the video is encrypted. | 110 // Called to disble the current fullscreen playback if the video is encrypted. |
| 110 // TODO(qinmin): remove this once we have the new fullscreen mode. | 111 // TODO(qinmin): remove this once we have the new fullscreen mode. |
| 111 void DisableFullscreenEncryptedMediaPlayback(); | 112 void DisableFullscreenEncryptedMediaPlayback(); |
| 112 | 113 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; | 222 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; |
| 222 | 223 |
| 223 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; | 224 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; |
| 224 | 225 |
| 225 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); | 226 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); |
| 226 }; | 227 }; |
| 227 | 228 |
| 228 } // namespace content | 229 } // namespace content |
| 229 | 230 |
| 230 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ | 231 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ |
| OLD | NEW |