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

Unified Diff: components/html_viewer/media_factory.cc

Issue 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed compile error in webmediaplayer_impl Created 5 years, 6 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: components/html_viewer/media_factory.cc
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index 78ffa29f49e9c9b4e952b2b45180d9ed62312b78..7e8634cda2fff0da3633326e6e4af5c6d23d89fc 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -70,6 +70,7 @@ blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client,
+ blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
blink::WebContentDecryptionModule* initial_cdm,
mojo::Shell* shell) {
#if defined(OS_ANDROID)
@@ -96,8 +97,8 @@ blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
initial_cdm);
base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
- return new media::WebMediaPlayerImpl(frame, client, delegate,
- media_renderer_factory.Pass(),
+ return new media::WebMediaPlayerImpl(frame, client, encrypted_client,
+ delegate, media_renderer_factory.Pass(),
GetCdmFactory(), params);
#endif // defined(OS_ANDROID)
}

Powered by Google App Engine
This is Rietveld 408576698