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 a22c5e05d281a7cb633642b32a5836025bf1f183..62e6fcd9aa0ce02516436916463ae5f64c205d5c 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -39,6 +39,7 @@ |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
#include "content/browser/geolocation/geolocation_service_context.h" |
#include "content/browser/loader/resource_dispatcher_host_impl.h" |
+#include "content/browser/media/audio_output_impl.h" |
#include "content/browser/permissions/permission_service_context.h" |
#include "content/browser/permissions/permission_service_impl.h" |
#include "content/browser/presentation/presentation_service_impl.h" |
@@ -318,6 +319,15 @@ RenderFrameHostImpl::~RenderFrameHostImpl() { |
frame_tree_->ReleaseRenderViewHostRef(render_view_host_); |
} |
+AudioOutputImpl* RenderFrameHostImpl::GetAudioOutputImpl() { |
+ return audio_output_impl_; |
+} |
+ |
+void RenderFrameHostImpl::SetAudioOutputImpl( |
+ AudioOutputImpl* audio_output_impl) { |
+ audio_output_impl_ = audio_output_impl; |
+} |
+ |
int RenderFrameHostImpl::GetRoutingID() { |
return routing_id_; |
} |
@@ -1975,6 +1985,9 @@ void RenderFrameHostImpl::RegisterMojoServices() { |
GetServiceRegistry()->AddService<shell::mojom::Connector>(base::Bind( |
&FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get()))); |
+ GetServiceRegistry()->AddService( |
+ base::Bind(&AudioOutputImpl::CreateService, process_, routing_id_)); |
+ |
#if defined(ENABLE_WEBVR) |
const base::CommandLine& browser_command_line = |
*base::CommandLine::ForCurrentProcess(); |