chrome/browser/android/chrome_jni_registrar.cc - Issue 2399533002: Pull in vr_shell code for webvr

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: chrome/browser/android/chrome_jni_registrar.cc

Issue 2399533002: Pull in vr_shell code for webvr (Closed)

Patch Set: fix android_clang_dbg_receipt error Created 4 years, 2 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: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 535fce35f1a5b9843af80bddd92c089779c50795..abf0db463a76d5495a223bbd46f9b5a09e7c729f 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -176,7 +176,7 @@

#include "printing/printing_context_android.h"

#endif

-#if defined(ENABLE_VR_SHELL)

+#if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR)

#include "chrome/browser/android/vr_shell/vr_shell.h"

#include "chrome/browser/android/vr_shell/vr_shell_delegate.h"

#endif

@@ -380,7 +380,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register},

{"Variations", variations::android::RegisterVariations},

{"VariationsSession", chrome::android::RegisterVariationsSession},

-#if defined(ENABLE_VR_SHELL)

+#if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR)

{"VrShell", vr_shell::RegisterVrShell},

{"VrShellDelegate", vr_shell::RegisterVrShellDelegate},

#endif

« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/vr_shell/BUILD.gn » ('j') | no next file with comments »