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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)
Patch Set: Fix lint warnings generated by vr_shell's new pickier checks. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/vr_shell.h
diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
index 81c0ed93a506f108f34cc22ca34ea0ce49e6fb75..f60efc718e59a97027a864a6d4a14a466e853ced 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -173,7 +173,7 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
const gvr::Rectf& right_bounds) override;
void OnVRVsyncProviderRequest(
device::mojom::VRVSyncProviderRequest request) override;
- void UpdateVSyncInterval(long timebase_nanos,
+ void UpdateVSyncInterval(int64_t timebase_nanos,
double interval_seconds) override;
bool SupportsPresentation() override;
void ResetPose() override;
@@ -183,6 +183,8 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
void ProcessTabArray(JNIEnv* env, jobjectArray tabs, bool incognito);
+ bool vr_shell_enabled_;
+
std::unique_ptr<UiInterface> html_interface_;
bool content_paused_ = false;
bool webvr_mode_ = false;
« no previous file with comments | « chrome/browser/android/vr_shell/non_presenting_gvr_delegate.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