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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 712463004: media: Support MojoRendererService in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix BUILD.gn. Created 5 years, 11 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 | « content/browser/DEPS ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 faaca99ae0e64f59d2bc2787ad6a0ae70f11dfd5..8aff9d10a93008bb0a149b826265a41507a9afab 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -65,6 +65,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 {
@@ -1273,6 +1278,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;
@@ -1293,6 +1306,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) {
« no previous file with comments | « content/browser/DEPS ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698