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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1567123002: Support CAST+WMPI on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cast tests are now passing locally Created 4 years, 11 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/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index bc43dc39a3be545f3d88307cc15e0e988d125049..d2541fabdf93f0dc86614f1fb7a5d2024cca94b3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2409,9 +2409,13 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
if (!url_index_.get() || url_index_->frame() != frame)
url_index_.reset(new media::UrlIndex(frame));
- return new media::WebMediaPlayerImpl(
+ media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
+#if defined(OS_ANDROID) // WMPI_CAST
nasko 2016/01/15 20:08:37 Please leave an empty line before and after the #i
hubbe 2016/01/15 20:35:47 Done.
+ media_player->SetMediaPlayerManager(GetMediaPlayerManager());
+#endif
+ return media_player;
}
blink::WebMediaSession* RenderFrameImpl::createMediaSession() {

Powered by Google App Engine
This is Rietveld 408576698