content/renderer/render_frame_impl.cc - Issue 1808203005: [OnionSoup] Moving VR service from content to Blink

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reworked as per comments! Created 4 years, 9 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

« content/browser/vr/vr_device.h ('K') | « content/renderer/render_frame_impl.h ('k') | content/renderer/vr/vr_dispatcher.h » ('j') | third_party/WebKit/Source/modules/vr/VRController.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index a41cdb260b8e4372543204bdd996cae5d36ee182..45c55bc082e2e3b6c6fc345effbb177aae6e9e1e 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -239,10 +239,6 @@

#include "media/mojo/services/mojo_decoder_factory.h" // nogncheck

#endif

-#if defined(ENABLE_WEBVR)

-#include "content/renderer/vr/vr_dispatcher.h"

-#endif

using blink::WebContentDecryptionModule;

using blink::WebContextMenuData;

using blink::WebCString;

@@ -4270,15 +4266,6 @@ blink::WebUSBClient* RenderFrameImpl::usbClient() {

return usb_client_.get();

}

-#if defined(ENABLE_WEBVR)

-blink::WebVRClient* RenderFrameImpl::webVRClient() {

- if (!vr_dispatcher_)

- vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry()));

- return vr_dispatcher_.get();

-#endif

void RenderFrameImpl::didSerializeDataForFrame(

const WebCString& data,

WebFrameSerializerClient::FrameSerializationStatus status) {

« content/browser/vr/vr_device.h ('K') | « content/renderer/render_frame_impl.h ('k') | content/renderer/vr/vr_dispatcher.h » ('j') | third_party/WebKit/Source/modules/vr/VRController.cpp » ('J')