Chromium Code Reviews| 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" | |
|
dcheng
2016/11/04 05:24:46
This include doesn't seem necessary
mthiesse
2016/11/04 17:20:36
It was being indirectly included by gvr_delegate.h
| |
| 9 #include "jni/VrShellDelegate_jni.h" | 10 #include "jni/VrShellDelegate_jni.h" |
| 10 | 11 |
| 11 using base::android::JavaParamRef; | 12 using base::android::JavaParamRef; |
| 12 using base::android::AttachCurrentThread; | 13 using base::android::AttachCurrentThread; |
| 13 | 14 |
| 14 namespace vr_shell { | 15 namespace vr_shell { |
| 15 | 16 |
| 16 // A non presenting delegate for magic window mode. | 17 // A non presenting delegate for magic window mode. |
| 17 class GvrNonPresentingDelegate : public device::GvrDelegate { | 18 class GvrNonPresentingDelegate : public device::GvrDelegate { |
| 18 public: | 19 public: |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 | 119 |
| 119 bool RegisterVrShellDelegate(JNIEnv* env) { | 120 bool RegisterVrShellDelegate(JNIEnv* env) { |
| 120 return RegisterNativesImpl(env); | 121 return RegisterNativesImpl(env); |
| 121 } | 122 } |
| 122 | 123 |
| 123 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 124 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 124 return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj)); | 125 return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj)); |
| 125 } | 126 } |
| 126 | 127 |
| 127 } // namespace vr_shell | 128 } // namespace vr_shell |
| OLD | NEW |