chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java - Issue 2861003003: VR: Enable browsing for CCT and make ui_scene_manager aware of whether we're in CCT.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

Issue 2861003003: VR: Enable browsing for CCT and make ui_scene_manager aware of whether we're in CCT. (Closed)

Patch Set: Fix test compile Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 02e1eaf76ca5d0c25c8c2bd9937c17da2d416baa..6ea8491b9e3b41178fd4b9e600c6f154c81474e1 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

@@ -310,7 +310,7 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener,

}

private static boolean activitySupportsVrBrowsing(Activity activity) {

- return activity instanceof ChromeTabbedActivity;

+ return activity instanceof ChromeTabbedActivity || activity instanceof CustomTabActivity;

}

/**

@@ -500,8 +500,8 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener,

mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);

addVrViews();

- mVrShell.initializeNative(

- mActivity.getActivityTab(), mRequestedWebVr || tentativeWebVrMode);

+ mVrShell.initializeNative(mActivity.getActivityTab(), mRequestedWebVr || tentativeWebVrMode,

+ mActivity instanceof CustomTabActivity);

mVrShell.setWebVrModeEnabled(mRequestedWebVr || tentativeWebVrMode);

// onResume needs to be called on GvrLayout after initialization to make sure DON flow work