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

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: Rebased and Cleaned. 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
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 e71c219091b1ee53ef930b4c34033ecd2f4ba380..57527a456cbc3d74c25474b31c66fb3a1b7e0b78 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -57,6 +57,8 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
+#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/services/mojo_renderer_service.h"
#include "ui/accessibility/ax_tree.h"
#include "url/gurl.h"
@@ -1161,6 +1163,12 @@ void RenderFrameHostImpl::OnHidePopup() {
}
#endif
+static void CreateMediaRendererService(
+ mojo::InterfaceRequest<mojo::MediaRenderer> request) {
+ media::MojoRendererService* service = new media::MojoRendererService();
+ mojo::BindToRequest(service, &request);
+}
+
void RenderFrameHostImpl::RegisterMojoServices() {
GeolocationServiceContext* geolocation_service_context =
delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
@@ -1181,6 +1189,9 @@ void RenderFrameHostImpl::RegisterMojoServices() {
GetServiceRegistry()->AddService<PermissionService>(
base::Bind(&PermissionServiceContext::CreateService,
base::Unretained(permission_service_context_.get())));
+
+ GetServiceRegistry()->AddService<mojo::MediaRenderer>(
xhwang 2014/12/15 21:32:30 Currently we don't want to provide this service by
DaleCurtis 2014/12/15 23:21:17 I think an EXTERNAL_MEDIA_RENDERER define would wo
+ base::Bind(&CreateMediaRendererService));
}
void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) {

Powered by Google App Engine
This is Rietveld 408576698