Pull in vr_shell code for webvr

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.appmenu;
 
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 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;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.tab.Tab;
@@ skipping 144 matching lines @@
             requestItem.setVisible(!isChromeScheme || currentTab.isNativePage());
             requestItem.setChecked(currentTab.getUseDesktopUserAgent());
             requestItem.setTitleCondensed(requestItem.isChecked()
                     ? mActivity.getString(R.string.menu_request_desktop_site_on)
                     : mActivity.getString(R.string.menu_request_desktop_site_off));
 
             // Only display reader mode settings menu option if the current page is in reader mode.
             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) {
             if (isIncognito) {
                 // Hide normal close all tabs item.
                 menu.findItem(R.id.close_all_tabs_menu_id).setVisible(false);
                 // Enable close incognito tabs only if there are incognito tabs.
                 menu.findItem(R.id.close_all_incognito_tabs_menu_id).setEnabled(true);
             } else {
                 // Hide close incognito tabs item.
@@ skipping 81 matching lines @@
             bookmarkMenuItem.setIcon(R.drawable.btn_star_filled);
             bookmarkMenuItem.setChecked(true);
             bookmarkMenuItem.setTitleCondensed(mActivity.getString(R.string.edit_bookmark));
         } else {
             bookmarkMenuItem.setIcon(R.drawable.btn_star);
             bookmarkMenuItem.setChecked(false);
             bookmarkMenuItem.setTitleCondensed(null);
         }
     }
 }