| Index: content/browser/android/media_player_manager_impl.h
|
| diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h
|
| index 4daffeb484c6b5b2d5f4d881aff3d5d52d2a7718..0bcc60e223fbc59d04868116e3b864d3242da0f5 100644
|
| --- a/content/browser/android/media_player_manager_impl.h
|
| +++ b/content/browser/android/media_player_manager_impl.h
|
| @@ -73,8 +73,10 @@ class MediaPlayerManagerImpl
|
| virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
|
| virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
|
| virtual void DestroyAllMediaPlayers() OVERRIDE;
|
| - virtual void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek,
|
| - bool request_surface) OVERRIDE;
|
| + virtual void OnMediaSeekRequest(
|
| + int player_id, base::TimeDelta time_to_seek,
|
| + unsigned seek_request_id) OVERRIDE;
|
| + virtual void OnMediaConfigRequest(int player_id) OVERRIDE;
|
|
|
| #if defined(GOOGLE_TV)
|
| void AttachExternalVideoSurface(int player_id, jobject surface);
|
| @@ -108,7 +110,7 @@ class MediaPlayerManagerImpl
|
| virtual void OnReadFromDemuxerAck(
|
| int player_id,
|
| const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params);
|
| - void OnMediaSeekRequestAck(int player_id);
|
| + void OnMediaSeekRequestAck(int player_id, unsigned seek_request_id);
|
|
|
| #if defined(GOOGLE_TV)
|
| virtual void OnNotifyExternalSurface(
|
|
|