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

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: Fix test compile 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 // The native instance of the Java VrShell. This class is not threadsafe and 64 // The native instance of the Java VrShell. This class is not threadsafe and
65 // must only be used on the UI thread. 65 // must only be used on the UI thread.
66 class VrShell : public device::PresentingGvrDelegate, 66 class VrShell : public device::PresentingGvrDelegate,
67 device::GvrGamepadDataProvider { 67 device::GvrGamepadDataProvider {
68 public: 68 public:
69 VrShell(JNIEnv* env, 69 VrShell(JNIEnv* env,
70 jobject obj, 70 jobject obj,
71 ui::WindowAndroid* window, 71 ui::WindowAndroid* window,
72 bool for_web_vr, 72 bool for_web_vr,
73 bool in_cct,
73 VrShellDelegate* delegate, 74 VrShellDelegate* delegate,
74 gvr_context* gvr_api, 75 gvr_context* gvr_api,
75 bool reprojected_rendering); 76 bool reprojected_rendering);
76 void SwapContents( 77 void SwapContents(
77 JNIEnv* env, 78 JNIEnv* env,
78 const base::android::JavaParamRef<jobject>& obj, 79 const base::android::JavaParamRef<jobject>& obj,
79 const base::android::JavaParamRef<jobject>& web_contents, 80 const base::android::JavaParamRef<jobject>& web_contents,
80 const base::android::JavaParamRef<jobject>& touch_event_synthesizer); 81 const base::android::JavaParamRef<jobject>& touch_event_synthesizer);
81 void LoadUIContent(JNIEnv* env, 82 void LoadUIContent(JNIEnv* env,
82 const base::android::JavaParamRef<jobject>& obj); 83 const base::android::JavaParamRef<jobject>& obj);
(...skipping 137 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
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698