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 542ed6c78ab2793969a804f1b6512283bd0c0581..e3fd57c9028fc71a2efabde536c671dc77986dd3 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 |
@@ -732,7 +732,7 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener, |
private static boolean isVrCoreCompatible( |
VrCoreVersionChecker versionChecker, Tab tabToShowInfobarIn) { |
- int vrCoreCompatibility = versionChecker.getVrCoreCompatibility(); |
+ int vrCoreCompatibility = versionChecker.getVrCoreInfo().compatibility; |
ddorwin
2017/05/05 20:29:59
Can this throw an exception? See line 875.
tiborg
2017/05/10 20:39:51
getVrCoreInfo() always returns non-null and this f
|
if (vrCoreCompatibility == VrCoreVersionChecker.VR_NOT_AVAILABLE |
|| vrCoreCompatibility == VrCoreVersionChecker.VR_OUT_OF_DATE) { |
@@ -870,6 +870,11 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener, |
return mNativeVrShellDelegate; |
} |
+ @CalledByNative |
+ private VrCoreInfo getVrCoreInfo() { |
+ return (mVrCoreVersionChecker != null) ? mVrCoreVersionChecker.getVrCoreInfo() : null; |
+ } |
+ |
private void destroy() { |
if (sInstance == null) return; |
shutdownVr(true, false); |