Index: chrome/browser/android/vr_shell/vr_shell_delegate.h |
diff --git a/chrome/browser/android/vr_shell/vr_shell_delegate.h b/chrome/browser/android/vr_shell/vr_shell_delegate.h |
index ba1937b649caba70e5ffd6314e0728683f9a3fec..3da66d31d10ebeaf384d66d1de0d5b53dc2046a1 100644 |
--- a/chrome/browser/android/vr_shell/vr_shell_delegate.h |
+++ b/chrome/browser/android/vr_shell/vr_shell_delegate.h |
@@ -12,6 +12,8 @@ |
#include "base/android/jni_weak_ref.h" |
#include "base/callback.h" |
#include "base/macros.h" |
+#include "chrome/browser/android/vr_shell/vr_core_info.h" |
+#include "chrome/browser/android/vr_shell/vr_usage_monitor.h" |
#include "device/vr/android/gvr/gvr_delegate_provider.h" |
#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h" |
@@ -52,6 +54,13 @@ class VrShellDelegate : public device::GvrDelegateProvider { |
void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
+ jlong MakeNativeVrCoreInfo(JNIEnv* env, |
+ const base::android::JavaParamRef<jobject>& obj, |
+ jint major_version, |
+ jint minor_version, |
+ jint patch_version, |
+ jint compatibility); |
+ |
device::GvrDeviceProvider* device_provider() { return device_provider_; } |
// device::GvrDelegateProvider implementation. |
@@ -65,11 +74,11 @@ class VrShellDelegate : public device::GvrDelegateProvider { |
const base::Callback<void(bool)>& callback) override; |
device::GvrDelegate* GetDelegate() override; |
void SetListeningForActivate(bool listening) override; |
- |
void CreateNonPresentingDelegate(); |
- |
void OnActivateDisplayHandled(bool present_requested); |
+ std::unique_ptr<VrCoreInfo> MakeVrCoreInfo(JNIEnv* env); |
+ |
std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_; |
base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; |
device::GvrDeviceProvider* device_provider_ = nullptr; |