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

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

Issue 815293002: Support unprefixed EME in HTMLViewer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years 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 | « mojo/services/html_viewer/html_viewer.cc ('k') | mojo/services/html_viewer/webmediaplayer_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/webmediaplayer_factory.h
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.h b/mojo/services/html_viewer/webmediaplayer_factory.h
index 964ffac8ffc7a36a316fb10ae1a85d14a266ac92..687011a2a0808777df5f924082f75cabd9513e67 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.h
+++ b/mojo/services/html_viewer/webmediaplayer_factory.h
@@ -17,6 +17,7 @@ class SingleThreadTaskRunner;
}
namespace blink {
+class WebContentDecryptionModule;
class WebMediaPlayer;
class WebLocalFrame;
class WebURL;
@@ -44,10 +45,12 @@ class WebMediaPlayerFactory {
bool enable_mojo_media_renderer);
~WebMediaPlayerFactory();
- blink::WebMediaPlayer* CreateMediaPlayer(blink::WebLocalFrame* frame,
- const blink::WebURL& url,
- blink::WebMediaPlayerClient* client,
- mojo::Shell* shell);
+ blink::WebMediaPlayer* CreateMediaPlayer(
+ blink::WebLocalFrame* frame,
+ const blink::WebURL& url,
+ blink::WebMediaPlayerClient* client,
+ blink::WebContentDecryptionModule* initial_cdm,
+ mojo::Shell* shell);
private:
const media::AudioHardwareConfig& GetAudioHardwareConfig();
« no previous file with comments | « mojo/services/html_viewer/html_viewer.cc ('k') | mojo/services/html_viewer/webmediaplayer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698