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 ed02a6ee40c7e10f15be7ed007325263540cfd82..e2d6676d890b5e4d935e2869cb0d8b04e86535f3 100644 |
--- a/content/browser/media/android/browser_media_player_manager.cc |
+++ b/content/browser/media/android/browser_media_player_manager.cc |
@@ -59,28 +59,25 @@ |
} |
MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( |
- MediaPlayerHostMsg_Initialize_Type type, |
- int player_id, |
- const GURL& url, |
- const GURL& first_party_for_cookies, |
- int demuxer_client_id, |
+ const MediaPlayerHostMsg_Initialize_Params& media_player_params, |
bool hide_url_log, |
MediaPlayerManager* manager, |
BrowserDemuxerAndroid* demuxer) { |
- switch (type) { |
+ switch (media_player_params.type) { |
case MEDIA_PLAYER_TYPE_URL: { |
const std::string user_agent = GetContentClient()->GetUserAgent(); |
MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( |
- player_id, |
- url, |
- first_party_for_cookies, |
+ media_player_params.player_id, |
+ media_player_params.url, |
+ media_player_params.first_party_for_cookies, |
user_agent, |
hide_url_log, |
manager, |
base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, |
weak_ptr_factory_.GetWeakPtr()), |
base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, |
- weak_ptr_factory_.GetWeakPtr())); |
+ weak_ptr_factory_.GetWeakPtr()), |
+ media_player_params.frame_url); |
BrowserMediaPlayerManager* browser_media_player_manager = |
static_cast<BrowserMediaPlayerManager*>(manager); |
ContentViewCoreImpl* content_view_core_impl = |
@@ -92,8 +89,9 @@ |
// TODO(qinmin): extract the metadata once the user decided to load |
// the page. |
browser_media_player_manager->OnMediaMetadataChanged( |
- player_id, base::TimeDelta(), 0, 0, false); |
- } else if (!content_view_core_impl->ShouldBlockMediaRequest(url)) { |
+ media_player_params.player_id, base::TimeDelta(), 0, 0, false); |
+ } else if (!content_view_core_impl->ShouldBlockMediaRequest( |
+ media_player_params.url)) { |
media_player_bridge->Initialize(); |
} |
return media_player_bridge; |
@@ -101,13 +99,14 @@ |
case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: { |
return new MediaSourcePlayer( |
- player_id, |
+ media_player_params.player_id, |
manager, |
base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, |
weak_ptr_factory_.GetWeakPtr()), |
base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, |
weak_ptr_factory_.GetWeakPtr()), |
- demuxer->CreateDemuxer(demuxer_client_id)); |
+ demuxer->CreateDemuxer(media_player_params.demuxer_client_id), |
+ media_player_params.frame_url); |
} |
} |
@@ -420,23 +419,22 @@ |
} |
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(media_player_params.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; |
- |
- RemovePlayer(player_id); |
+ << media_player_params.demuxer_client_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, |
+ media_player_params, |
+ |
host->GetBrowserContext()->IsOffTheRecord(), this, |
host->browser_demuxer_android()); |
+ |
if (!player) |
return; |