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

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: combined KeyHandlingDemxuer w/ KeyHandlingChunkDemuxer 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 ba799a697bd9444023d77df2a6ad945354c5910f..e60924b624050f0419f4a20651d32299c1e62ac4 100644
--- a/content/browser/android/media_player_manager_impl.cc
+++ b/content/browser/android/media_player_manager_impl.cc
@@ -107,8 +107,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::MediaPlayerBridge::MediaSource media_source,
const GURL& first_party_for_cookies) {
for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin();
it != players_.end(); ++it) {
@@ -120,7 +121,7 @@ void MediaPlayerManagerImpl::OnInitialize(
RenderProcessHost* host = render_view_host()->GetProcess();
players_.push_back(media::MediaPlayerBridge::Create(
- player_id, url, is_media_source, first_party_for_cookies,
+ player_id, url, media_source, first_party_for_cookies,
host->GetBrowserContext()->IsOffTheRecord(), this,
#if defined(GOOGLE_TV)
base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer,

Powered by Google App Engine
This is Rietveld 408576698