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 3bb6b02a9d729a5a752585a9e4ea839678e83285..12248dc0ac68a32084809b85d256dcccf3f32637 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 |
@@ -420,10 +420,6 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener, |
*/ |
private boolean enterVrAfterDon() { |
if (mNativeVrShellDelegate == 0) return false; |
- if (mListeningForWebVrActivateBeforePause && !mRequestedWebVr) { |
- nativeDisplayActivate(mNativeVrShellDelegate); |
- return true; |
- } |
// Normally, if the active page doesn't have a vrdisplayactivate listener, and WebVR was not |
// presenting and VrShell was not enabled, the Daydream Homescreen should show after the DON |
@@ -434,6 +430,10 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener, |
return false; |
} |
+ if (mListeningForWebVrActivateBeforePause && !mRequestedWebVr) { |
+ nativeDisplayActivate(mNativeVrShellDelegate); |
+ } |
+ |
enterVr(); |
return true; |
} |