| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index d58dd9f1dc19250d432033c287a271699a5b2391..a9f8fa15373e43be80064d9c8b917c9b0002be58 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -64,6 +64,11 @@
|
| #include "content/browser/frame_host/popup_menu_helper_mac.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_MEDIA_MOJO_RENDERER)
|
| +#include "media/mojo/interfaces/media_renderer.mojom.h"
|
| +#include "media/mojo/services/mojo_renderer_service.h"
|
| +#endif
|
| +
|
| using base::TimeDelta;
|
|
|
| namespace content {
|
| @@ -1153,6 +1158,14 @@ void RenderFrameHostImpl::OnHidePopup() {
|
| }
|
| #endif
|
|
|
| +#if defined(ENABLE_MEDIA_MOJO_RENDERER)
|
| +static void CreateMediaRendererService(
|
| + mojo::InterfaceRequest<mojo::MediaRenderer> request) {
|
| + media::MojoRendererService* service = new media::MojoRendererService();
|
| + mojo::BindToRequest(service, &request);
|
| +}
|
| +#endif
|
| +
|
| void RenderFrameHostImpl::RegisterMojoServices() {
|
| GeolocationServiceContext* geolocation_service_context =
|
| delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
|
| @@ -1173,6 +1186,11 @@ void RenderFrameHostImpl::RegisterMojoServices() {
|
| GetServiceRegistry()->AddService<PermissionService>(
|
| base::Bind(&PermissionServiceContext::CreateService,
|
| base::Unretained(permission_service_context_.get())));
|
| +
|
| +#if defined(ENABLE_MEDIA_MOJO_RENDERER)
|
| + GetServiceRegistry()->AddService<mojo::MediaRenderer>(
|
| + base::Bind(&CreateMediaRendererService));
|
| +#endif
|
| }
|
|
|
| void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) {
|
|
|