| 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;
|
| }
|
| }
|
|
|
|
|