| 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 6c6a464360c16a659a0a658c2ad19dd45994dfd3..4b95b2c5b8d43dde5143f01b537a7f0952bc1ab2 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -81,6 +81,10 @@
|
| #include "media/mojo/services/mojo_renderer_service.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_WEBVR)
|
| +#include "content/browser/vr/vr_device_manager.h"
|
| +#endif
|
| +
|
| using base::TimeDelta;
|
|
|
| namespace content {
|
| @@ -1576,6 +1580,16 @@ void RenderFrameHostImpl::RegisterMojoServices() {
|
| GetServiceRegistry()->AddService<mojo::Shell>(base::Bind(
|
| &FrameMojoShell::BindRequest, base::Unretained(frame_mojo_shell_.get())));
|
|
|
| +#if defined(ENABLE_WEBVR)
|
| + const base::CommandLine& browser_command_line =
|
| + *base::CommandLine::ForCurrentProcess();
|
| +
|
| + if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
|
| + GetServiceRegistry()->AddService<VRService>(
|
| + base::Bind(&VRDeviceManager::BindRequest));
|
| + }
|
| +#endif
|
| +
|
| GetContentClient()->browser()->OverrideRenderFrameMojoServices(
|
| GetServiceRegistry(), this);
|
| }
|
|
|