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

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

Issue 2891243002: VR: Loading DD controller model after GL is initialized (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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 uint32_t device_id) override; 188 uint32_t device_id) override;
189 189
190 // device::PresentingGvrDelegate implementation. 190 // device::PresentingGvrDelegate implementation.
191 void SetSubmitClient( 191 void SetSubmitClient(
192 device::mojom::VRSubmitFrameClientPtr submit_client) override; 192 device::mojom::VRSubmitFrameClientPtr submit_client) override;
193 193
194 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito); 194 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
195 195
196 void PollMediaAccessFlag(); 196 void PollMediaAccessFlag();
197 197
198 bool HasDaydreamSupport();
199
198 bool vr_shell_enabled_; 200 bool vr_shell_enabled_;
199 201
200 bool content_paused_ = false; 202 bool content_paused_ = false;
201 bool webvr_mode_ = false; 203 bool webvr_mode_ = false;
202 204
203 content::WebContents* web_contents_ = nullptr; 205 content::WebContents* web_contents_ = nullptr;
204 base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_; 206 base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_;
205 ui::WindowAndroid* window_; 207 ui::WindowAndroid* window_;
206 std::unique_ptr<VrCompositor> compositor_; 208 std::unique_ptr<VrCompositor> compositor_;
207 209
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 241 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
240 242
241 DISALLOW_COPY_AND_ASSIGN(VrShell); 243 DISALLOW_COPY_AND_ASSIGN(VrShell);
242 }; 244 };
243 245
244 bool RegisterVrShell(JNIEnv* env); 246 bool RegisterVrShell(JNIEnv* env);
245 247
246 } // namespace vr_shell 248 } // namespace vr_shell
247 249
248 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 250 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698