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

Unified Diff: mojo/services/html_viewer/webmediaplayer_factory.cc

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes for android + mojo Created 6 years, 3 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
« no previous file with comments | « media/blink/webmediaplayer_params.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index e5309a9c00085c57f071e1e11183de90ee2f800a..bbf8c816c9985a788b006a250ce26e2dfd57ad9a 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -56,7 +56,8 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
scoped_refptr<media::GpuVideoAcceleratorFactories>(),
GetMediaThreadTaskRunner(),
compositor_task_runner_,
- base::Bind(&media::NullEncryptedMediaPlayerSupport::Create));
+ base::Bind(&media::NullEncryptedMediaPlayerSupport::Create),
+ NULL);
base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
return new media::WebMediaPlayerImpl(frame, client, delegate, params);
« no previous file with comments | « media/blink/webmediaplayer_params.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698