| 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 b00b6b53d7203c407f6223a428280ccd13f4bfe3..d5efb5103ac3b36f9a53007e9582383cd873d588 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
|
| @@ -216,20 +216,23 @@ public class VrShellDelegate {
|
| if (tab == null || tab.getContentViewCore() == null) {
|
| return false;
|
| }
|
| -
|
| // For now we don't handle native pages. crbug.com/661609
|
| if (tab.getNativePage() != null || tab.isShowingSadTab()) {
|
| return false;
|
| }
|
| + // crbug.com/667781
|
| + if (MultiWindowUtils.getInstance().isInMultiWindowMode(mActivity)) {
|
| + return false;
|
| + }
|
| + // crbug.com/667908
|
| + if (!mVrDaydreamApi.isDaydreamCurrentViewer()) {
|
| + return false;
|
| + }
|
| return true;
|
| }
|
|
|
| @CalledByNative
|
| private void presentRequested(boolean inWebVR) {
|
| - if (MultiWindowUtils.getInstance().isInMultiWindowMode(mActivity)) {
|
| - nativeSetPresentResult(mNativeVrShellDelegate, false);
|
| - return;
|
| - }
|
| // TODO(mthiesse): There's a GVR bug where they're not calling us back with the intent we
|
| // ask them to when we call DaydreamApi#launchInVr. As a temporary hack, remember locally
|
| // that we want to enter webVR.
|
|
|