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 2fe672d0de4fc338d63cfaa9f2eeba79bccd1dca..55f477547f30a69ca24a21254b8b974bfb347469 100644 |
--- a/content/browser/android/media_player_manager_impl.cc |
+++ b/content/browser/android/media_player_manager_impl.cc |
@@ -105,8 +105,9 @@ void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { |
} |
void MediaPlayerManagerImpl::OnInitialize( |
- int player_id, const GURL& url, |
- bool is_media_source, |
+ int player_id, |
+ const GURL& url, |
+ media::MediaPlayerAndroid::MediaSourceType media_source_type, |
const GURL& first_party_for_cookies) { |
for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
it != players_.end(); ++it) { |
@@ -118,8 +119,12 @@ void MediaPlayerManagerImpl::OnInitialize( |
RenderProcessHost* host = render_view_host()->GetProcess(); |
players_.push_back(media::MediaPlayerAndroid::Create( |
- player_id, url, is_media_source, first_party_for_cookies, |
- host->GetBrowserContext()->IsOffTheRecord(), this, |
+ player_id, |
+ url, |
+ media_source_type, |
+ first_party_for_cookies, |
+ host->GetBrowserContext()->IsOffTheRecord(), |
+ this, |
#if defined(GOOGLE_TV) |
base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, |
base::Unretained(this)), |
@@ -135,8 +140,7 @@ void MediaPlayerManagerImpl::OnInitialize( |
base::Unretained(this)), |
base::Bind(&MediaPlayerManagerImpl::OnSeekComplete, |
base::Unretained(this)), |
- base::Bind(&MediaPlayerManagerImpl::OnTimeUpdate, |
- base::Unretained(this)), |
+ base::Bind(&MediaPlayerManagerImpl::OnTimeUpdate, base::Unretained(this)), |
base::Bind(&MediaPlayerManagerImpl::OnMediaInterrupted, |
base::Unretained(this)))); |
} |