| 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 37fb5dde1b53b725b8f74b225e01a01428ac7db2..d33db00b8afe3cf86266fb51240bcfcee2170b3f 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
| @@ -578,10 +578,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
| if (CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_TEST_INTENTS)) {
|
| handleDebugIntent(intent);
|
| }
|
| - if (VrShellDelegate.isDaydreamVrIntent(intent)) {
|
| - // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
|
| - VrShellDelegate.enterVRFromIntent(intent);
|
| - } else if (ShortcutHelper.isShowToastIntent(intent)) {
|
| + if (ShortcutHelper.isShowToastIntent(intent)) {
|
| ShortcutHelper.showAddedToHomescreenToastFromIntent(intent);
|
| }
|
| } finally {
|
| @@ -816,12 +813,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
|
|
| mIntentWithEffect = false;
|
| if ((mIsOnFirstRun || getSavedInstanceState() == null) && intent != null) {
|
| - if (VrShellDelegate.isDaydreamVrIntent(intent)) {
|
| - // TODO(mthiesse): Improve startup when started from a VR intent.
|
| - // crbug.com/668541
|
| - // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
|
| - VrShellDelegate.enterVRIfNecessary();
|
| - } else if (!mIntentHandler.shouldIgnoreIntent(intent)) {
|
| + if (!mIntentHandler.shouldIgnoreIntent(intent)) {
|
| mIntentWithEffect = mIntentHandler.onNewIntent(intent);
|
| }
|
|
|
| @@ -899,10 +891,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|
| }
|
| }
|
| return true;
|
| - } else if (requestCode == VrShellDelegate.EXIT_VR_RESULT) {
|
| - // TODO(mthiesse): Move this into ChromeActivity. crbug.com/688611
|
| - VrShellDelegate.onExitVRResult(resultCode);
|
| - return true;
|
| }
|
| return false;
|
| }
|
|
|