chrome/browser/android/chrome_jni_registrar.cc - Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define.

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 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)

Patch Set: Fix lint warnings generated by vr_shell's new pickier checks. Created 3 years, 10 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 bd0d8d3871a8e5ce7b506016f2f98afec72c32b5..feb96d4c5f17ee5067ac12fc499a185d5ae632c9 100644

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

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

@@ -186,7 +186,7 @@

#include "printing/printing_context_android.h"

#endif

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

+#if defined(ENABLE_WEBVR)

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

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

#include "third_party/gvr-android-sdk/display_synchronizer_jni.h"

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

{"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register},

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

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

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

+#if defined(ENABLE_WEBVR)

{"VrShell", vr_shell::RegisterVrShell},

{"VrShellDelegate", vr_shell::RegisterVrShellDelegate},

{"DisplaySynchronizer",

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