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 d0c48f8b8466c0cb301417d2a17c50220de3dcee..ca7b8d9fb9b7335e45c403c7dba00f26ad2583f0 100644 |
--- a/mojo/services/html_viewer/html_document_view.cc |
+++ b/mojo/services/html_viewer/html_document_view.cc |
@@ -15,6 +15,7 @@ |
#include "mojo/public/interfaces/application/shell.mojom.h" |
#include "mojo/services/html_viewer/blink_input_events_type_converters.h" |
#include "mojo/services/html_viewer/blink_url_request_type_converters.h" |
+#include "mojo/services/html_viewer/webmediaplayer_factory.h" |
#include "mojo/services/html_viewer/webstoragenamespace_impl.h" |
#include "mojo/services/html_viewer/weburlloader_impl.h" |
#include "mojo/services/public/cpp/view_manager/view.h" |
@@ -84,12 +85,14 @@ bool CanNavigateLocally(blink::WebFrame* frame, |
HTMLDocumentView::HTMLDocumentView( |
URLResponsePtr response, |
InterfaceRequest<ServiceProvider> service_provider_request, |
- Shell* shell) |
+ Shell* shell, |
+ WebMediaPlayerFactory* web_media_player_factory) |
: shell_(shell), |
web_view_(NULL), |
root_(NULL), |
view_manager_client_factory_(shell, this), |
repaint_pending_(false), |
+ web_media_player_factory_(web_media_player_factory), |
weak_factory_(this) { |
ServiceProviderImpl* exported_services = new ServiceProviderImpl(); |
exported_services->AddService(&view_manager_client_factory_); |
@@ -162,6 +165,13 @@ bool HTMLDocumentView::allowsBrokenNullLayerTreeView() const { |
return true; |
} |
+blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer( |
+ blink::WebLocalFrame* frame, |
+ const blink::WebURL& url, |
+ blink::WebMediaPlayerClient* client) { |
+ return web_media_player_factory_->CreateMediaPlayer(frame, url, client); |
+} |
+ |
blink::WebFrame* HTMLDocumentView::createChildFrame( |
blink::WebLocalFrame* parent, |
const blink::WebString& frameName) { |