| Index: content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| index 34d21cdf8b1857f09dc7d40efb3f5434416b7453..8ff537dc6522e3b32d3712206801584da3b33437 100644
|
| --- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| +++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| @@ -39,8 +39,8 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate)
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased,
|
| OnMediaPlayerReleased)
|
| - IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
|
| - IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
|
| + IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterVideoView, OnDidEnterVideoView)
|
| + IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitVideoView, OnDidExitVideoView)
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| @@ -140,20 +140,22 @@ void WebMediaPlayerProxyImplAndroid::OnMediaPlayerReleased(
|
| player->OnPlayerReleased();
|
| }
|
|
|
| -void WebMediaPlayerProxyImplAndroid::OnDidEnterFullscreen(
|
| - int player_id) {
|
| +void WebMediaPlayerProxyImplAndroid::OnDidEnterVideoView(
|
| + int player_id, int personality) {
|
| + LOG(INFO) << "player_id = " << player_id << ", personality = " << personality;
|
| webkit_media::WebMediaPlayerImplAndroid* player =
|
| GetWebMediaPlayer(player_id);
|
| if (player)
|
| - player->OnDidEnterFullscreen();
|
| + player->OnDidEnterVideoView(personality);
|
| }
|
|
|
| -void WebMediaPlayerProxyImplAndroid::OnDidExitFullscreen(
|
| - int player_id) {
|
| +void WebMediaPlayerProxyImplAndroid::OnDidExitVideoView(
|
| + int player_id, int personality) {
|
| + LOG(INFO) << "player_id = " << player_id << ", personality = " << personality;
|
| webkit_media::WebMediaPlayerImplAndroid* player =
|
| GetWebMediaPlayer(player_id);
|
| if (player)
|
| - player->OnDidExitFullscreen();
|
| + player->OnDidExitVideoView(personality);
|
| }
|
|
|
| void WebMediaPlayerProxyImplAndroid::OnPlayerPlay(int player_id) {
|
|
|