| Index: chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
|
| index 8c2e12ba7cf0291d1df3f3675dbe41206d755411..7868df3ab07b5c0a96f0cd59e70f3107544456b5 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java
|
| @@ -15,6 +15,7 @@ import android.os.Build;
|
| import android.os.Bundle;
|
| import android.os.StrictMode;
|
| import android.provider.Browser;
|
| +import android.support.annotation.Nullable;
|
| import android.support.customtabs.CustomTabsIntent;
|
| import android.text.TextUtils;
|
|
|
| @@ -49,6 +50,7 @@ import org.chromium.chrome.browser.upgrade.UpgradeActivity;
|
| import org.chromium.chrome.browser.util.FeatureUtilities;
|
| import org.chromium.chrome.browser.util.IntentUtils;
|
| import org.chromium.chrome.browser.util.UrlUtilities;
|
| +import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
|
| import org.chromium.chrome.browser.webapps.ActivityAssigner;
|
| import org.chromium.chrome.browser.webapps.WebappLauncherActivity;
|
| import org.chromium.ui.widget.Toast;
|
| @@ -196,7 +198,11 @@ public class ChromeLauncherActivity extends Activity
|
|
|
| // Check if we should launch the ChromeTabbedActivity.
|
| if (!mIsCustomTabIntent && !FeatureUtilities.isDocumentMode(this)) {
|
| - launchTabbedMode();
|
| + Bundle options = null;
|
| + if (VrShellDelegate.isVrIntent(getIntent())) {
|
| + options = VrShellDelegate.getVrIntentOptions(this);
|
| + }
|
| + launchTabbedMode(options);
|
| finish();
|
| return;
|
| }
|
| @@ -385,7 +391,7 @@ public class ChromeLauncherActivity extends Activity
|
| * Handles launching a {@link ChromeTabbedActivity}.
|
| */
|
| @SuppressLint("InlinedApi")
|
| - private void launchTabbedMode() {
|
| + private void launchTabbedMode(@Nullable Bundle options) {
|
| maybePrefetchDnsInBackground();
|
|
|
| Intent newIntent = new Intent(getIntent());
|
| @@ -409,7 +415,7 @@ public class ChromeLauncherActivity extends Activity
|
| // This system call is often modified by OEMs and not actionable. http://crbug.com/619646.
|
| StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
| try {
|
| - startActivity(newIntent);
|
| + startActivity(newIntent, options);
|
| } catch (SecurityException ex) {
|
| if (isContentScheme) {
|
| Toast.makeText(
|
|
|