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 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h" | 5 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "chrome/browser/android/vr_shell/vr_shell.h" | 8 #include "chrome/browser/android/vr_shell/vr_shell.h" |
9 #include "device/vr/android/gvr/gvr_device_provider.h" | 9 #include "device/vr/android/gvr/gvr_device_provider.h" |
10 #include "jni/VrShellDelegate_jni.h" | 10 #include "jni/VrShellDelegate_jni.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 return device_provider_; | 60 return device_provider_; |
61 } | 61 } |
62 | 62 |
63 void VrShellDelegate::ExitWebVRIfNecessary(JNIEnv* env, jobject obj) { | 63 void VrShellDelegate::ExitWebVRIfNecessary(JNIEnv* env, jobject obj) { |
64 if (!device_provider_) | 64 if (!device_provider_) |
65 return; | 65 return; |
66 | 66 |
67 device_provider_->OnGvrDelegateRemoved(); | 67 device_provider_->OnGvrDelegateRemoved(); |
68 } | 68 } |
69 | 69 |
70 bool VrShellDelegate::RequestWebVRPresent( | 70 void VrShellDelegate::SetPresentResult(JNIEnv* env, jobject obj, |
71 base::WeakPtr<device::GvrDeviceProvider> device_provider) { | 71 jboolean result) { |
72 // Only set one device provider at a time | 72 CHECK(!present_callback_.is_null()); |
| 73 present_callback_.Run(result); |
| 74 present_callback_.Reset(); |
| 75 } |
| 76 |
| 77 void VrShellDelegate::RequestWebVRPresent( |
| 78 base::WeakPtr<device::GvrDeviceProvider> device_provider, |
| 79 const base::Callback<void(bool)>& callback) { |
| 80 // Only set one device provider at a time. |
73 DCHECK(!device_provider_); | 81 DCHECK(!device_provider_); |
| 82 |
| 83 // Only one RequestPresent request at a time. |
| 84 DCHECK(present_callback_.is_null()); |
| 85 |
74 device_provider_ = device_provider; | 86 device_provider_ = device_provider; |
| 87 present_callback_ = callback; |
75 | 88 |
76 // If/When VRShell is ready for use it will call OnVrShellReady. | 89 // If/When VRShell is ready for use it will call SetPresentResult. |
77 JNIEnv* env = AttachCurrentThread(); | 90 JNIEnv* env = AttachCurrentThread(); |
78 Java_VrShellDelegate_enterVRIfNecessary(env, j_vr_shell_delegate_.obj(), | 91 Java_VrShellDelegate_presentRequested(env, j_vr_shell_delegate_.obj(), true); |
79 true); | |
80 return true; | |
81 } | 92 } |
82 | 93 |
83 void VrShellDelegate::ExitWebVRPresent() { | 94 void VrShellDelegate::ExitWebVRPresent() { |
84 device_provider_.reset(); | 95 device_provider_.reset(); |
85 | 96 |
86 // VRShell is no longer needed by WebVR, allow it to shut down if it's not | 97 // VRShell is no longer needed by WebVR, allow it to shut down if it's not |
87 // being used elsewhere. | 98 // being used elsewhere. |
88 JNIEnv* env = AttachCurrentThread(); | 99 JNIEnv* env = AttachCurrentThread(); |
89 Java_VrShellDelegate_exitWebVR(env, j_vr_shell_delegate_.obj()); | 100 Java_VrShellDelegate_exitWebVR(env, j_vr_shell_delegate_.obj()); |
90 } | 101 } |
(...skipping 27 matching lines...) Expand all Loading... |
118 | 129 |
119 bool RegisterVrShellDelegate(JNIEnv* env) { | 130 bool RegisterVrShellDelegate(JNIEnv* env) { |
120 return RegisterNativesImpl(env); | 131 return RegisterNativesImpl(env); |
121 } | 132 } |
122 | 133 |
123 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 134 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
124 return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj)); | 135 return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj)); |
125 } | 136 } |
126 | 137 |
127 } // namespace vr_shell | 138 } // namespace vr_shell |
OLD | NEW |