chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java - Issue 2470583002: Add VrShell feature flag and wire it up to VrShell delegate.

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/ChromeTabbedActivity.java

Issue 2470583002: Add VrShell feature flag and wire it up to VrShell delegate. (Closed)

Patch Set: rebase Created 4 years, 1 month 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/ChromeFeatureList.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.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/ChromeTabbedActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

index 502abad40b5516cc12df37e9f06a2fb2e3722287..41b68f203c9f7bb6c5cff46223219d029c1a0c3d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -441,7 +441,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode

if (getActivityTab() != null) getActivityTab().setIsAllowedToReturnToExternalApp(false);

- if (mVrShellDelegate.isVrShellEnabled()) {

+ if (mVrShellDelegate.isVrInitialized()) {

mVrShellDelegate.close();

}

mTabModelSelectorImpl.saveState();