Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2861003003: VR: Enable browsing for CCT and make ui_scene_manager aware of whether we're in CCT. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // The native instance of the Java VrShell. This class is not threadsafe and 65 // The native instance of the Java VrShell. This class is not threadsafe and
66 // must only be used on the UI thread. 66 // must only be used on the UI thread.
67 class VrShell : public device::PresentingGvrDelegate, 67 class VrShell : public device::PresentingGvrDelegate,
68 device::GvrGamepadDataProvider { 68 device::GvrGamepadDataProvider {
69 public: 69 public:
70 VrShell(JNIEnv* env, 70 VrShell(JNIEnv* env,
71 jobject obj, 71 jobject obj,
72 ui::WindowAndroid* window, 72 ui::WindowAndroid* window,
73 bool for_web_vr, 73 bool for_web_vr,
74 bool in_cct,
74 VrShellDelegate* delegate, 75 VrShellDelegate* delegate,
75 gvr_context* gvr_api, 76 gvr_context* gvr_api,
76 bool reprojected_rendering); 77 bool reprojected_rendering);
77 void SwapContents( 78 void SwapContents(
78 JNIEnv* env, 79 JNIEnv* env,
79 const base::android::JavaParamRef<jobject>& obj, 80 const base::android::JavaParamRef<jobject>& obj,
80 const base::android::JavaParamRef<jobject>& web_contents, 81 const base::android::JavaParamRef<jobject>& web_contents,
81 const base::android::JavaParamRef<jobject>& touch_event_synthesizer); 82 const base::android::JavaParamRef<jobject>& touch_event_synthesizer);
82 void LoadUIContent(JNIEnv* env, 83 void LoadUIContent(JNIEnv* env,
83 const base::android::JavaParamRef<jobject>& obj); 84 const base::android::JavaParamRef<jobject>& obj);
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 221 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
221 222
222 DISALLOW_COPY_AND_ASSIGN(VrShell); 223 DISALLOW_COPY_AND_ASSIGN(VrShell);
223 }; 224 };
224 225
225 bool RegisterVrShell(JNIEnv* env); 226 bool RegisterVrShell(JNIEnv* env);
226 227
227 } // namespace vr_shell 228 } // namespace vr_shell
228 229
229 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 230 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698