| Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
| index 1157436e4a182369894bf90b8952448673b7d6a9..40950ea843fe8586b01b5e74415e78fe8c75f973 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
| @@ -74,6 +74,7 @@ import org.chromium.chrome.browser.tabmodel.TabReparentingParams;
|
| import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
|
| import org.chromium.chrome.browser.util.ColorUtils;
|
| import org.chromium.chrome.browser.util.UrlUtilities;
|
| +import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
|
| import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
|
| import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| @@ -128,6 +129,8 @@ public class CustomTabActivity extends ChromeActivity {
|
| // prerender and hidden tab loads with unmatching fragments.
|
| private boolean mIsFirstLoad;
|
|
|
| + private boolean mIsDaydreamIntent;
|
| +
|
| private static class PageLoadMetricsObserver implements PageLoadMetrics.Observer {
|
| private final CustomTabsConnection mConnection;
|
| private final CustomTabsSessionToken mSession;
|
| @@ -297,6 +300,7 @@ public class CustomTabActivity extends ChromeActivity {
|
| public void onStart() {
|
| super.onStart();
|
| mIsClosing = false;
|
| + mIsDaydreamIntent = VrShellDelegate.isDaydreamVrIntent(getIntent());
|
| CustomTabsConnection.getInstance(getApplication())
|
| .keepAliveForSession(mIntentDataProvider.getSession(),
|
| mIntentDataProvider.getKeepAliveServiceIntent());
|
| @@ -532,6 +536,11 @@ public class CustomTabActivity extends ChromeActivity {
|
| super.finishNativeInitialization();
|
| }
|
|
|
| + @Override
|
| + public final boolean shouldAutoPresent() {
|
| + return mIsDaydreamIntent;
|
| + }
|
| +
|
| /**
|
| * Encapsulates CustomTabsConnection#takeHiddenTab()
|
| * with additional initialization logic.
|
|
|