OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ |
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 | 11 |
12 #include "base/android/jni_weak_ref.h" | 12 #include "base/android/jni_weak_ref.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "chrome/browser/android/vr_shell/vr_core_info.h" |
| 16 #include "chrome/browser/android/vr_shell/vr_usage_monitor.h" |
15 #include "device/vr/android/gvr/gvr_delegate_provider.h" | 17 #include "device/vr/android/gvr/gvr_delegate_provider.h" |
16 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/
gvr_types.h" | 18 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/
gvr_types.h" |
17 | 19 |
18 namespace device { | 20 namespace device { |
19 class GvrDelegate; | 21 class GvrDelegate; |
20 class GvrDeviceProvider; | 22 class GvrDeviceProvider; |
21 class PresentingGvrDelegate; | 23 class PresentingGvrDelegate; |
22 } | 24 } |
23 | 25 |
24 namespace vr_shell { | 26 namespace vr_shell { |
(...skipping 20 matching lines...) Expand all Loading... |
45 void DisplayActivate(JNIEnv* env, | 47 void DisplayActivate(JNIEnv* env, |
46 const base::android::JavaParamRef<jobject>& obj); | 48 const base::android::JavaParamRef<jobject>& obj); |
47 void UpdateVSyncInterval(JNIEnv* env, | 49 void UpdateVSyncInterval(JNIEnv* env, |
48 const base::android::JavaParamRef<jobject>& obj, | 50 const base::android::JavaParamRef<jobject>& obj, |
49 jlong timebase_nanos, | 51 jlong timebase_nanos, |
50 jdouble interval_seconds); | 52 jdouble interval_seconds); |
51 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); | 53 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
52 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); | 54 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
53 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); | 55 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); |
54 | 56 |
| 57 jlong MakeNativeVrCoreInfo(JNIEnv* env, |
| 58 const base::android::JavaParamRef<jobject>& obj, |
| 59 jint major_version, |
| 60 jint minor_version, |
| 61 jint patch_version, |
| 62 jint compatibility); |
| 63 |
55 device::GvrDeviceProvider* device_provider() { return device_provider_; } | 64 device::GvrDeviceProvider* device_provider() { return device_provider_; } |
56 | 65 |
57 // device::GvrDelegateProvider implementation. | 66 // device::GvrDelegateProvider implementation. |
58 void ExitWebVRPresent() override; | 67 void ExitWebVRPresent() override; |
59 | 68 |
60 private: | 69 private: |
61 // device::GvrDelegateProvider implementation. | 70 // device::GvrDelegateProvider implementation. |
62 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override; | 71 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override; |
63 void ClearDeviceProvider() override; | 72 void ClearDeviceProvider() override; |
64 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client, | 73 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client, |
65 const base::Callback<void(bool)>& callback) override; | 74 const base::Callback<void(bool)>& callback) override; |
66 device::GvrDelegate* GetDelegate() override; | 75 device::GvrDelegate* GetDelegate() override; |
67 void SetListeningForActivate(bool listening) override; | 76 void SetListeningForActivate(bool listening) override; |
| 77 void CreateNonPresentingDelegate(); |
| 78 void OnActivateDisplayHandled(bool present_requested); |
68 | 79 |
69 void CreateNonPresentingDelegate(); | 80 std::unique_ptr<VrCoreInfo> MakeVrCoreInfo(JNIEnv* env); |
70 | |
71 void OnActivateDisplayHandled(bool present_requested); | |
72 | 81 |
73 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_; | 82 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_; |
74 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; | 83 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; |
75 device::GvrDeviceProvider* device_provider_ = nullptr; | 84 device::GvrDeviceProvider* device_provider_ = nullptr; |
76 device::PresentingGvrDelegate* presenting_delegate_ = nullptr; | 85 device::PresentingGvrDelegate* presenting_delegate_ = nullptr; |
77 base::Callback<void(bool)> present_callback_; | 86 base::Callback<void(bool)> present_callback_; |
78 int64_t timebase_nanos_ = 0; | 87 int64_t timebase_nanos_ = 0; |
79 double interval_seconds_ = 0; | 88 double interval_seconds_ = 0; |
80 device::mojom::VRSubmitFrameClientPtr submit_client_; | 89 device::mojom::VRSubmitFrameClientPtr submit_client_; |
81 bool pending_successful_present_request_ = false; | 90 bool pending_successful_present_request_ = false; |
82 | 91 |
83 base::WeakPtrFactory<VrShellDelegate> weak_ptr_factory_; | 92 base::WeakPtrFactory<VrShellDelegate> weak_ptr_factory_; |
84 | 93 |
85 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate); | 94 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate); |
86 }; | 95 }; |
87 | 96 |
88 bool RegisterVrShellDelegate(JNIEnv* env); | 97 bool RegisterVrShellDelegate(JNIEnv* env); |
89 | 98 |
90 } // namespace vr_shell | 99 } // namespace vr_shell |
91 | 100 |
92 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ | 101 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ |
OLD | NEW |