| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 
| 6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 
| 7 | 7 | 
| 8 #include <map> | 8 #include <map> | 
| 9 | 9 | 
| 10 #include "base/callback.h" | 10 #include "base/callback.h" | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 41   void ExitFullscreen(bool release_media_player); | 41   void ExitFullscreen(bool release_media_player); | 
| 42   void SetVideoSurface(jobject surface); | 42   void SetVideoSurface(jobject surface); | 
| 43 | 43 | 
| 44   // An internal method that checks for current time routinely and generates | 44   // An internal method that checks for current time routinely and generates | 
| 45   // time update events. | 45   // time update events. | 
| 46   void OnTimeUpdate(int player_id, base::TimeDelta current_time); | 46   void OnTimeUpdate(int player_id, base::TimeDelta current_time); | 
| 47 | 47 | 
| 48   // Callbacks needed by media::MediaPlayerBridge. | 48   // Callbacks needed by media::MediaPlayerBridge. | 
| 49   void OnPrepared(int player_id, base::TimeDelta duration); | 49   void OnPrepared(int player_id, base::TimeDelta duration); | 
| 50   void OnPlaybackComplete(int player_id); | 50   void OnPlaybackComplete(int player_id); | 
|  | 51   void OnMediaInterrupted(int player_id); | 
| 51   void OnBufferingUpdate(int player_id, int percentage); | 52   void OnBufferingUpdate(int player_id, int percentage); | 
| 52   void OnSeekComplete(int player_id, base::TimeDelta current_time); | 53   void OnSeekComplete(int player_id, base::TimeDelta current_time); | 
| 53   void OnError(int player_id, int error); | 54   void OnError(int player_id, int error); | 
| 54   void OnVideoSizeChanged(int player_id, int width, int height); | 55   void OnVideoSizeChanged(int player_id, int width, int height); | 
| 55 | 56 | 
| 56   // media::MediaPlayerBridgeManager overrides. | 57   // media::MediaPlayerBridgeManager overrides. | 
| 57   virtual void RequestMediaResources(media::MediaPlayerBridge* player) OVERRIDE; | 58   virtual void RequestMediaResources(media::MediaPlayerBridge* player) OVERRIDE; | 
| 58   virtual void ReleaseMediaResources(media::MediaPlayerBridge* player) OVERRIDE; | 59   virtual void ReleaseMediaResources(media::MediaPlayerBridge* player) OVERRIDE; | 
| 59 | 60 | 
| 60   // Release all the players managed by this object. | 61   // Release all the players managed by this object. | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 83 | 84 | 
| 84   // Player ID of the fullscreen media player. | 85   // Player ID of the fullscreen media player. | 
| 85   int fullscreen_player_id_; | 86   int fullscreen_player_id_; | 
| 86 | 87 | 
| 87   DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerAndroid); | 88   DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerAndroid); | 
| 88 }; | 89 }; | 
| 89 | 90 | 
| 90 }  // namespace content | 91 }  // namespace content | 
| 91 | 92 | 
| 92 #endif  // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 93 #endif  // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_ANDROID_H_ | 
| OLD | NEW | 
|---|