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

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

Issue 600233002: Update mojo for changes to createMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « mojo/services/html_viewer/html_document_view.h ('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/html_document_view.cc
diff --git a/mojo/services/html_viewer/html_document_view.cc b/mojo/services/html_viewer/html_document_view.cc
index d1ff3fe426ca81382009aad2d87067a3cfa7b504..7056501683f97b479f68a411133bca2e5864291e 100644
--- a/mojo/services/html_viewer/html_document_view.cc
+++ b/mojo/services/html_viewer/html_document_view.cc
@@ -180,6 +180,14 @@ blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
return web_media_player_factory_->CreateMediaPlayer(frame, url, client);
}
+blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
+ blink::WebLocalFrame* frame,
+ const blink::WebURL& url,
+ blink::WebMediaPlayerClient* client,
+ blink::WebContentDecryptionModule* initial_cdm) {
+ return createMediaPlayer(frame, url, client);
ddorwin 2014/09/25 00:56:52 Really, the factory should be updated to accept in
+}
+
blink::WebFrame* HTMLDocumentView::createChildFrame(
blink::WebLocalFrame* parent,
const blink::WebString& frameName) {
« no previous file with comments | « mojo/services/html_viewer/html_document_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698