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

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

Issue 2248183002: VR Shell Experimental work master (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void HandleQueuedTasks(); 133 void HandleQueuedTasks();
134 134
135 // samplerExternalOES texture data for UI content image. 135 // samplerExternalOES texture data for UI content image.
136 jint ui_texture_id_ = 0; 136 jint ui_texture_id_ = 0;
137 // samplerExternalOES texture data for main content image. 137 // samplerExternalOES texture data for main content image.
138 jint content_texture_id_ = 0; 138 jint content_texture_id_ = 0;
139 139
140 float desktop_screen_tilt_; 140 float desktop_screen_tilt_;
141 float desktop_height_; 141 float desktop_height_;
142 142
143 ContentRectangle* desktop_plane_;
144
145 UiScene scene_; 143 UiScene scene_;
146 144
147 std::unique_ptr<gvr::GvrApi> gvr_api_; 145 std::unique_ptr<gvr::GvrApi> gvr_api_;
148 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; 146 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_;
149 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; 147 std::unique_ptr<gvr::BufferViewport> buffer_viewport_;
150 std::unique_ptr<gvr::SwapChain> swap_chain_; 148 std::unique_ptr<gvr::SwapChain> swap_chain_;
151 149
152 gvr::Sizei render_size_; 150 gvr::Sizei render_size_;
153 151
154 std::queue<base::Callback<void()>> task_queue_; 152 std::queue<base::Callback<void()>> task_queue_;
(...skipping 28 matching lines...) Expand all
183 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 181 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
184 182
185 DISALLOW_COPY_AND_ASSIGN(VrShell); 183 DISALLOW_COPY_AND_ASSIGN(VrShell);
186 }; 184 };
187 185
188 bool RegisterVrShell(JNIEnv* env); 186 bool RegisterVrShell(JNIEnv* env);
189 187
190 } // namespace vr_shell 188 } // namespace vr_shell
191 189
192 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 190 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698