| 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 4debec59ab4641db031e49bea713768e971c1777..27d466a996eea8e04775d78d532b83343c301780 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
|
| @@ -880,7 +880,8 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener,
|
| // mListeningForWebVrActivate for them.
|
| if (mVrSupportLevel != VR_DAYDREAM) return;
|
| mListeningForWebVrActivate = listening;
|
| - if (listening && !mPaused) {
|
| + if (mPaused) return;
|
| + if (listening) {
|
| registerDaydreamIntent(mVrDaydreamApi, mActivity);
|
| if (mAutopresentWebVr) {
|
| // Dispatch vrdisplayactivate so that the WebVr page can call requestPresent
|
| @@ -890,7 +891,7 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener,
|
| // UI which is suboptimal.
|
| nativeDisplayActivate(mNativeVrShellDelegate);
|
| }
|
| - } else {
|
| + } else if (!canEnterVr(mActivity.getActivityTab())) {
|
| unregisterDaydreamIntent(mVrDaydreamApi);
|
| }
|
| }
|
|
|