| 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 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/android/jni_weak_ref.h" | 12 #include "base/android/jni_weak_ref.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 15 #include "chrome/browser/android/vr_shell/ui_elements.h" | 15 #include "chrome/browser/android/vr_shell/ui_elements.h" |
| 16 #include "chrome/browser/android/vr_shell/ui_scene.h" | 16 #include "chrome/browser/android/vr_shell/ui_scene.h" |
| 17 #include "device/vr/android/gvr/gvr_delegate.h" | 17 #include "device/vr/android/gvr/gvr_delegate.h" |
| 18 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h" | 18 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr.h" |
| 19 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty
pes.h" | 19 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr_types.h" |
| 20 | 20 |
| 21 namespace content { | 21 namespace content { |
| 22 class ContentViewCore; | 22 class ContentViewCore; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace ui { | 25 namespace ui { |
| 26 class WindowAndroid; | 26 class WindowAndroid; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace vr_shell { | 29 namespace vr_shell { |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 144 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 145 | 145 |
| 146 DISALLOW_COPY_AND_ASSIGN(VrShell); | 146 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 147 }; | 147 }; |
| 148 | 148 |
| 149 bool RegisterVrShell(JNIEnv* env); | 149 bool RegisterVrShell(JNIEnv* env); |
| 150 | 150 |
| 151 } // namespace vr_shell | 151 } // namespace vr_shell |
| 152 | 152 |
| 153 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 153 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |