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

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 review comments Created 5 years, 5 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 | « components/html_viewer/media_factory.h ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/media_factory.cc
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index e65010c852039c70c7729fc9c76d01a562163aab..182e8e545d6da4490723518d2ead71465e3b181d 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -71,6 +71,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)
@@ -97,8 +98,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)
}
« no previous file with comments | « components/html_viewer/media_factory.h ('k') | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698