content/browser/android/browser_jni_registrar.cc - Issue 829803003: Adding Chrome-side WebVR interface

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/browser/android/browser_jni_registrar.cc

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated to use Mojo as requested by eng review Created 5 years, 7 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:

Index: content/browser/android/browser_jni_registrar.cc

diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc

index c6844c19161ef2e86a54d1de56ccec76454b4b24..3b46a3b9b3ed1380f9b0fd9bdcf0ebfae10d4922 100644

--- a/content/browser/android/browser_jni_registrar.cc

+++ b/content/browser/android/browser_jni_registrar.cc

@@ -38,6 +38,7 @@

#include "content/browser/screen_orientation/screen_orientation_delegate_android.h"

#include "content/browser/speech/speech_recognizer_impl_android.h"

#include "content/browser/time_zone_monitor_android.h"

+#include "content/browser/vr/android/cardboard/cardboard_vr_device.h"

#include "content/browser/web_contents/web_contents_android.h"

#include "mojo/android/system/core_impl.h"

@@ -48,6 +49,10 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {

{"BrowserAccessibilityManager",

content::RegisterBrowserAccessibilityManager},

{"BrowserStartupController", content::RegisterBrowserStartupController},

+#if defined(ENABLE_WEBVR)

+ {"CardboardVRDevice",

+ content::CardboardVRDevice::RegisterCardboardVRDevice},

+#endif

{"ChildProcessLauncher", content::RegisterChildProcessLauncher},

{"ContentReadbackHandler",

content::ContentReadbackHandler::RegisterContentReadbackHandler},