Pull in vr_shell code for webvr

chrome/browser/android/chrome_jni_registrar.cc

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 b702d527a1ebe1683d574e8f20fc1ebfa96a6ef7..944eedf91911daae0803c4e9310bc31daabe30f5 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -175,7 +175,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"

[agrieve, 2016/10/07 17:36:43]

can these be vr_common/vr_common.h?

[bshe, 2016/10/07 20:36:22]

I think it probably makes sense to keep vr_shell ATM. WebVr only delegates its
presentation path to vr shell. A lot of the code in it still relevant to
vr_shell instead of WebVr. Ideally, we want to have a better separation of vr
shell and webvr's presentation code. But it is probably out the scope of this
CL. And once we have a better isolation of code, a file called vr_common then
makes more sense.

 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 #endif
@@ -377,7 +377,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