Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2059)

Unified Diff: content/browser/android/media_player_manager_impl.cc

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Dongwon and Yuncheol's comments Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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))));
}

Powered by Google App Engine
This is Rietveld 408576698