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

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

Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)
Patch Set: Created 3 years, 10 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 void UpdateVSyncInterval(long timebase_nanos, 176 void UpdateVSyncInterval(long timebase_nanos,
177 double interval_seconds) override; 177 double interval_seconds) override;
178 bool SupportsPresentation() override; 178 bool SupportsPresentation() override;
179 void ResetPose() override; 179 void ResetPose() override;
180 void CreateVRDisplayInfo( 180 void CreateVRDisplayInfo(
181 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback, 181 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
182 uint32_t device_id) override; 182 uint32_t device_id) override;
183 183
184 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito); 184 void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
185 185
186 bool feature_enabled_;
187
186 std::unique_ptr<UiInterface> html_interface_; 188 std::unique_ptr<UiInterface> html_interface_;
187 bool content_paused_ = false; 189 bool content_paused_ = false;
188 bool webvr_mode_ = false; 190 bool webvr_mode_ = false;
189 191
190 content::WebContents* main_contents_; 192 content::WebContents* main_contents_;
191 std::unique_ptr<VrCompositor> content_compositor_; 193 std::unique_ptr<VrCompositor> content_compositor_;
192 content::WebContents* ui_contents_; 194 content::WebContents* ui_contents_;
193 std::unique_ptr<VrCompositor> ui_compositor_; 195 std::unique_ptr<VrCompositor> ui_compositor_;
194 196
195 std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_; 197 std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_;
(...skipping 16 matching lines...) Expand all
212 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 214 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
213 215
214 DISALLOW_COPY_AND_ASSIGN(VrShell); 216 DISALLOW_COPY_AND_ASSIGN(VrShell);
215 }; 217 };
216 218
217 bool RegisterVrShell(JNIEnv* env); 219 bool RegisterVrShell(JNIEnv* env);
218 220
219 } // namespace vr_shell 221 } // namespace vr_shell
220 222
221 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 223 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698