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

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

Issue 2461503002: Provide URL-related info to the VR HTML UI. (Closed)
Patch Set: Created 4 years, 1 month 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 17 matching lines...) Expand all
28 28
29 namespace vr_shell { 29 namespace vr_shell {
30 30
31 class UiInterface; 31 class UiInterface;
32 class UiScene; 32 class UiScene;
33 class VrCompositor; 33 class VrCompositor;
34 class VrController; 34 class VrController;
35 class VrInputManager; 35 class VrInputManager;
36 class VrShellDelegate; 36 class VrShellDelegate;
37 class VrShellRenderer; 37 class VrShellRenderer;
38 class VrWebContentsObserver;
38 struct ContentRectangle; 39 struct ContentRectangle;
39 struct VrGesture; 40 struct VrGesture;
40 41
41 enum UiAction { 42 enum UiAction {
42 HISTORY_BACK = 0, 43 HISTORY_BACK = 0,
43 HISTORY_FORWARD, 44 HISTORY_FORWARD,
44 RELOAD, 45 RELOAD,
45 ZOOM_OUT, 46 ZOOM_OUT,
46 ZOOM_IN, 47 ZOOM_IN,
47 RELOAD_UI 48 RELOAD_UI
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 145
145 gvr::Sizei render_size_; 146 gvr::Sizei render_size_;
146 147
147 std::queue<base::Callback<void()>> task_queue_; 148 std::queue<base::Callback<void()>> task_queue_;
148 base::Lock task_queue_lock_; 149 base::Lock task_queue_lock_;
149 150
150 std::unique_ptr<VrCompositor> content_compositor_; 151 std::unique_ptr<VrCompositor> content_compositor_;
151 content::WebContents* main_contents_; 152 content::WebContents* main_contents_;
152 std::unique_ptr<VrCompositor> ui_compositor_; 153 std::unique_ptr<VrCompositor> ui_compositor_;
153 content::WebContents* ui_contents_; 154 content::WebContents* ui_contents_;
155 std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_;
154 156
155 VrShellDelegate* delegate_ = nullptr; 157 VrShellDelegate* delegate_ = nullptr;
156 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; 158 std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
157 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_; 159 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
158 160
159 bool touch_pending_ = false; 161 bool touch_pending_ = false;
160 gvr::Quatf controller_quat_; 162 gvr::Quatf controller_quat_;
161 163
162 gvr::Vec3f target_point_; 164 gvr::Vec3f target_point_;
163 const ContentRectangle* target_element_ = nullptr; 165 const ContentRectangle* target_element_ = nullptr;
(...skipping 18 matching lines...) Expand all
182 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 184 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
183 185
184 DISALLOW_COPY_AND_ASSIGN(VrShell); 186 DISALLOW_COPY_AND_ASSIGN(VrShell);
185 }; 187 };
186 188
187 bool RegisterVrShell(JNIEnv* env); 189 bool RegisterVrShell(JNIEnv* env);
188 190
189 } // namespace vr_shell 191 } // namespace vr_shell
190 192
191 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 193 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698