| Index: content/browser/android/media_player_manager_impl.cc
|
| diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc
|
| index 54622e676d180a5a9ef0d9b0756f467a38918c6b..d1c5e72251ff6f4cf7b61d62b753c81e33890204 100644
|
| --- a/content/browser/android/media_player_manager_impl.cc
|
| +++ b/content/browser/android/media_player_manager_impl.cc
|
| @@ -46,12 +46,14 @@ bool MediaPlayerManagerImpl::OnMessageReceived(const IPC::Message& msg) {
|
| DestroyAllMediaPlayers)
|
| IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady,
|
| OnDemuxerReady)
|
| + IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
|
| + OnReadFromDemuxerAck)
|
| + IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_MediaSeekRequestAck,
|
| + OnMediaSeekRequestAck)
|
| #if defined(GOOGLE_TV)
|
| IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
|
| OnNotifyExternalSurface)
|
| #endif
|
| - IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
|
| - OnReadFromDemuxerAck)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -241,6 +243,12 @@ void MediaPlayerManagerImpl::OnReadFromDemuxerAck(
|
| player->ReadFromDemuxerAck(params);
|
| }
|
|
|
| +void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) {
|
| + MediaPlayerAndroid* player = GetPlayer(player_id);
|
| + if (player)
|
| + player->OnSeekRequestAck();
|
| +}
|
| +
|
| MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) {
|
| for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
|
| it != players_.end(); ++it) {
|
| @@ -284,11 +292,17 @@ void MediaPlayerManagerImpl::OnBufferingUpdate(
|
| }
|
|
|
| void MediaPlayerManagerImpl::OnSeekComplete(int player_id,
|
| - base::TimeDelta current_time) {
|
| + base::TimeDelta current_time) {
|
| Send(new MediaPlayerMsg_MediaSeekCompleted(
|
| routing_id(), player_id, current_time));
|
| }
|
|
|
| +void MediaPlayerManagerImpl::OnMediaSeekRequest(int player_id,
|
| + base::TimeDelta time_to_seek) {
|
| + Send(new MediaPlayerMsg_MediaSeekRequest(
|
| + routing_id(), player_id, time_to_seek));
|
| +}
|
| +
|
| void MediaPlayerManagerImpl::OnError(int player_id, int error) {
|
| Send(new MediaPlayerMsg_MediaError(routing_id(), player_id, error));
|
| if (fullscreen_player_id_ != -1)
|
|
|