| 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_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 uint32_t device_id) override; | 189 uint32_t device_id) override; |
| 190 | 190 |
| 191 // device::PresentingGvrDelegate implementation. | 191 // device::PresentingGvrDelegate implementation. |
| 192 void SetSubmitClient( | 192 void SetSubmitClient( |
| 193 device::mojom::VRSubmitFrameClientPtr submit_client) override; | 193 device::mojom::VRSubmitFrameClientPtr submit_client) override; |
| 194 | 194 |
| 195 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito); | 195 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito); |
| 196 | 196 |
| 197 void PollMediaAccessFlag(); | 197 void PollMediaAccessFlag(); |
| 198 | 198 |
| 199 bool HasDaydreamSupport(JNIEnv* env); |
| 200 |
| 199 bool vr_shell_enabled_; | 201 bool vr_shell_enabled_; |
| 200 | 202 |
| 201 bool content_paused_ = false; | 203 bool content_paused_ = false; |
| 202 bool webvr_mode_ = false; | 204 bool webvr_mode_ = false; |
| 203 | 205 |
| 204 content::WebContents* web_contents_ = nullptr; | 206 content::WebContents* web_contents_ = nullptr; |
| 205 base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_; | 207 base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_; |
| 206 ui::WindowAndroid* window_; | 208 ui::WindowAndroid* window_; |
| 207 std::unique_ptr<VrCompositor> compositor_; | 209 std::unique_ptr<VrCompositor> compositor_; |
| 208 | 210 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 242 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 241 | 243 |
| 242 DISALLOW_COPY_AND_ASSIGN(VrShell); | 244 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 243 }; | 245 }; |
| 244 | 246 |
| 245 bool RegisterVrShell(JNIEnv* env); | 247 bool RegisterVrShell(JNIEnv* env); |
| 246 | 248 |
| 247 } // namespace vr_shell | 249 } // namespace vr_shell |
| 248 | 250 |
| 249 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 251 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |