| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 namespace vr_shell { | 33 namespace vr_shell { |
| 34 | 34 |
| 35 class UiInterface; | 35 class UiInterface; |
| 36 class UiScene; | 36 class UiScene; |
| 37 class VrCompositor; | 37 class VrCompositor; |
| 38 class VrController; | 38 class VrController; |
| 39 class VrInputManager; | 39 class VrInputManager; |
| 40 class VrShellDelegate; | 40 class VrShellDelegate; |
| 41 class VrShellRenderer; | 41 class VrShellRenderer; |
| 42 class VrWebContentsObserver; |
| 42 struct ContentRectangle; | 43 struct ContentRectangle; |
| 43 | 44 |
| 44 enum UiAction { | 45 enum UiAction { |
| 45 HISTORY_BACK = 0, | 46 HISTORY_BACK = 0, |
| 46 HISTORY_FORWARD, | 47 HISTORY_FORWARD, |
| 47 RELOAD, | 48 RELOAD, |
| 48 ZOOM_OUT, | 49 ZOOM_OUT, |
| 49 ZOOM_IN, | 50 ZOOM_IN, |
| 50 RELOAD_UI | 51 RELOAD_UI |
| 51 }; | 52 }; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 152 |
| 152 gvr::Sizei render_size_; | 153 gvr::Sizei render_size_; |
| 153 | 154 |
| 154 std::queue<base::Callback<void()>> task_queue_; | 155 std::queue<base::Callback<void()>> task_queue_; |
| 155 base::Lock task_queue_lock_; | 156 base::Lock task_queue_lock_; |
| 156 | 157 |
| 157 std::unique_ptr<VrCompositor> content_compositor_; | 158 std::unique_ptr<VrCompositor> content_compositor_; |
| 158 content::WebContents* main_contents_; | 159 content::WebContents* main_contents_; |
| 159 std::unique_ptr<VrCompositor> ui_compositor_; | 160 std::unique_ptr<VrCompositor> ui_compositor_; |
| 160 content::WebContents* ui_contents_; | 161 content::WebContents* ui_contents_; |
| 162 std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_; |
| 161 | 163 |
| 162 VrShellDelegate* delegate_ = nullptr; | 164 VrShellDelegate* delegate_ = nullptr; |
| 163 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; | 165 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; |
| 164 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_; | 166 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_; |
| 165 | 167 |
| 166 bool touch_pending_ = false; | 168 bool touch_pending_ = false; |
| 167 gvr::Quatf controller_quat_; | 169 gvr::Quatf controller_quat_; |
| 168 | 170 |
| 169 gvr::Vec3f target_point_; | 171 gvr::Vec3f target_point_; |
| 170 const ContentRectangle* target_element_ = nullptr; | 172 const ContentRectangle* target_element_ = nullptr; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 189 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 191 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 190 | 192 |
| 191 DISALLOW_COPY_AND_ASSIGN(VrShell); | 193 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 192 }; | 194 }; |
| 193 | 195 |
| 194 bool RegisterVrShell(JNIEnv* env); | 196 bool RegisterVrShell(JNIEnv* env); |
| 195 | 197 |
| 196 } // namespace vr_shell | 198 } // namespace vr_shell |
| 197 | 199 |
| 198 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 200 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |