Chromium Code Reviews| Index: content/browser/media/android/browser_media_player_manager.cc |
| diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc |
| index ac37e4261fc9466daad23b098db620b086e9ad89..e87b728eece24c73de1a93f4eadf878550c731d6 100644 |
| --- a/content/browser/media/android/browser_media_player_manager.cc |
| +++ b/content/browser/media/android/browser_media_player_manager.cc |
| @@ -517,25 +517,27 @@ void BrowserMediaPlayerManager::OnExitFullscreen(int player_id) { |
| void BrowserMediaPlayerManager::OnInitialize( |
| MediaPlayerHostMsg_Initialize_Type type, |
| - int player_id, |
| - const GURL& url, |
| - const GURL& first_party_for_cookies, |
| - int demuxer_client_id) { |
| - DCHECK(type != MEDIA_PLAYER_TYPE_MEDIA_SOURCE || demuxer_client_id > 0) |
| + const MediaPlayerHostMsg_Initialize_Params& media_player_params) { |
| + DCHECK(type != MEDIA_PLAYER_TYPE_MEDIA_SOURCE || |
| + media_player_params.demuxer_client_id > 0) |
| << "Media source players must have positive demuxer client IDs: " |
| - << demuxer_client_id; |
| + << media_player_params.demuxer_client_id; |
| - RemovePlayer(player_id); |
| + RemovePlayer(media_player_params.player_id); |
| RenderProcessHostImpl* host = static_cast<RenderProcessHostImpl*>( |
| web_contents()->GetRenderProcessHost()); |
| MediaPlayerAndroid* player = CreateMediaPlayer( |
| - type, player_id, url, first_party_for_cookies, demuxer_client_id, |
| + type, media_player_params.player_id, media_player_params.url, |
|
acolwell GONE FROM CHROMIUM
2014/06/09 20:02:09
nit: Looks like you could just pass media_player_p
May
2014/06/10 18:22:19
Done.
|
| + media_player_params.first_party_for_cookies, |
| + media_player_params.demuxer_client_id, |
| host->GetBrowserContext()->IsOffTheRecord(), this, |
| host->browser_demuxer_android()); |
| + |
| if (!player) |
| return; |
| + player->set_frame_url(media_player_params.frame_url); |
|
acolwell GONE FROM CHROMIUM
2014/06/09 20:02:09
nit: Any reason not to make this part of the playe
May
2014/06/10 18:22:19
Done.
|
| AddPlayer(player); |
| } |