chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java - Issue 2399533002: Pull in vr_shell code for webvr

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/appmenu/AppMenuPropertiesDelegate.java

Issue 2399533002: Pull in vr_shell code for webvr (Closed)

Patch Set: fix android_clang_dbg_receipt error Created 4 years, 2 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/ChromeSwitches.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.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/appmenu/AppMenuPropertiesDelegate.java

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

index 655fa82e574c0486b2ea8c547545e395b74b9759..2250058072bc825bf22bcf78e9ba71158142dac2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

@@ -10,8 +10,10 @@ import android.view.Menu;

import android.view.MenuItem;

import org.chromium.base.ApiCompatibilityUtils;

+import org.chromium.base.CommandLine;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeActivity;

+import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.ShortcutHelper;

import org.chromium.chrome.browser.UrlConstants;

import org.chromium.chrome.browser.bookmarks.BookmarkBridge;

@@ -176,8 +178,9 @@ public class AppMenuPropertiesDelegate {

menu.findItem(R.id.reader_mode_prefs_id)

.setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));

- // Only display the Enter VR button if VR Shell is enabled.

- menu.findItem(R.id.enter_vr_id).setVisible(mActivity.isVrShellEnabled());

+ // Only display the Enter VR button if VR Shell Dev environment is enabled.

+ menu.findItem(R.id.enter_vr_id).setVisible(

+ CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_VR_SHELL_DEV));

}

if (isOverviewMenu) {