OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H | 5 #ifndef CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H |
6 #define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H | 6 #define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 | 9 |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "content/browser/vr/vr_device.h" | 12 #include "content/browser/vr/vr_device.h" |
13 | 13 |
14 using namespace mojom; | |
Yuki
2016/03/22 07:15:03
In general, "using namespace" in headers is discou
RaviKasibhatla
2016/03/23 15:20:50
Done.
| |
15 | |
14 namespace content { | 16 namespace content { |
15 | 17 |
16 class CardboardVRDevice : public VRDevice { | 18 class CardboardVRDevice : public VRDevice { |
17 public: | 19 public: |
18 static bool RegisterCardboardVRDevice(JNIEnv* env); | 20 static bool RegisterCardboardVRDevice(JNIEnv* env); |
19 | 21 |
20 explicit CardboardVRDevice(VRDeviceProvider* provider); | 22 explicit CardboardVRDevice(VRDeviceProvider* provider); |
21 ~CardboardVRDevice() override; | 23 ~CardboardVRDevice() override; |
22 | 24 |
23 VRDeviceInfoPtr GetVRDevice() override; | 25 VRDeviceInfoPtr GetVRDevice() override; |
24 VRSensorStatePtr GetSensorState() override; | 26 VRSensorStatePtr GetSensorState() override; |
25 void ResetSensor() override; | 27 void ResetSensor() override; |
26 | 28 |
27 private: | 29 private: |
28 base::android::ScopedJavaGlobalRef<jobject> j_cardboard_device_; | 30 base::android::ScopedJavaGlobalRef<jobject> j_cardboard_device_; |
29 base::android::ScopedJavaGlobalRef<jfloatArray> j_head_matrix_; | 31 base::android::ScopedJavaGlobalRef<jfloatArray> j_head_matrix_; |
30 | 32 |
31 unsigned int frame_index_; | 33 unsigned int frame_index_; |
32 | 34 |
33 DISALLOW_COPY_AND_ASSIGN(CardboardVRDevice); | 35 DISALLOW_COPY_AND_ASSIGN(CardboardVRDevice); |
34 }; | 36 }; |
35 | 37 |
36 } // namespace content | 38 } // namespace content |
37 | 39 |
38 #endif // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H | 40 #endif // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_H |
OLD | NEW |