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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

Issue 2747923002: Fix crash entering VR with debug settings on to skip DON flow. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
index 47a98fe36484764005db5b96d6e96961014829aa..14a01769f01c9f1f275b1fc17840d8bbedfb96f3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
@@ -400,6 +400,7 @@ public class VrShellDelegate {
}
private void enterVR() {
+ if (mInVr) return;
if (mRestoreSystemUiVisibilityFlag == -1
|| mActivity.getResources().getConfiguration().orientation
!= Configuration.ORIENTATION_LANDSCAPE) {
@@ -717,6 +718,7 @@ public class VrShellDelegate {
}
private boolean createVrShell() {
+ assert mVrShell == null;
if (mVrClassesWrapper == null) return false;
mTabModelSelector = mActivity.getCompositorViewHolder().detachForVR();
if (mTabModelSelector == null) return false;
@@ -768,6 +770,7 @@ public class VrShellDelegate {
mVrShell.teardown();
mVrShell = null;
mActivity.getCompositorViewHolder().onExitVR(mTabModelSelector);
+ mTabModelSelector = null;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698