Enable WebVR presentation from Chrome Custom Tab

chrome/android/java/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
 <!--
 Note: This is a jinja2 template, processed at build time into the final manifest.
 
 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
 by a child template that "extends" this file.
@@ skipping 30 matching lines @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>

[Ted C, 2017/03/31 18:17:18]

@yusufo -- We already have task moveToFront in ActivityDelegateImpl, but I'm
wondering if that is different.  Since this is manipulating CCTs, the task ID
might not be something Chrome owns (since the root task would be something like
gmail).  In that case, the getAppTasks from ActivityManager wouldn't return the
CCT one?

     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
     {% set enable_vr = enable_vr|default(0) %}
     {% if enable_vr == "true" %}
     <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
     <uses-feature android:name="android.software.vr.mode" android:required="false"/>
     <!-- Indicates use of VR features that are available only on Daydream-ready devices. -->
@@ skipping 299 matching lines @@
             android:exported="false"
             android:windowSoftInputMode="adjustResize"
             android:launchMode="singleTask"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
             android:hardwareAccelerated="false"
             {# We can only use blocks once in Jinja, for future substitutions we use
             self.supports_video_persistence(). #}
             {% block supports_video_persistence %}
             {% endblock %}
             >
-            <!--
-              See the VRChromeTabbedActivity alias below for an explanation of this dummy intent
-              filter. We need to add these filters here as well, or non-presenting webVR pages will
-              trigger a daydream incompatible app message.
-            -->
-            <intent-filter>
-                <action android:name="org.chromium.chrome.browser.dummy.action" />
-                <category android:name="com.google.intent.category.DAYDREAM" />
-                <category android:name="com.google.intent.category.CARDBOARD" />
-            </intent-filter>
         </activity>
-
-        {% if enable_vr == "true" %}
-        <!--
-            TODO(mthiesse): Temporarily skip ChromeLauncherActivity when returning from Daydream
-            DON flow to avoid polluting metrics.
-        -->
-        <activity-alias android:name="org.chromium.chrome.browser.VRChromeTabbedActivity"
-            android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActivity"
-            android:enableVrMode="@string/gvr_vr_mode_component">
-            <!--
-              Daydream api categorizes an activity to three categories: Cardboard only, hybrid
-              or Daydream. It does so by testing if intents can be resolved by the activity
-              that requests it.
-              In Chrome, CTA is the activity that uses Daydream api and we want to be in hybrid
-              category. So add an intent filter that could pass Daydream tests here.
-            -->
-            <intent-filter>
-                <action android:name="org.chromium.chrome.browser.dummy.action" />
-                <category android:name="com.google.intent.category.DAYDREAM" />
-                <category android:name="com.google.intent.category.CARDBOARD" />
-            </intent-filter>
-        </activity-alias>
-        {% endif %}
-
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
              android:theme="@style/TabbedModeTheme"
              android:exported="false"
              android:windowSoftInputMode="adjustResize"
              android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
              android:launchMode="singleTask"
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
              android:hardwareAccelerated="false"
              {{ self.supports_video_persistence() }}
              >
@@ skipping 210 matching lines @@
 
         <!-- Activity for dispatching intents to Instant Apps. -->
         <activity
             android:name="org.chromium.chrome.browser.instantapps.AuthenticatedProxyActivity"
             android:exported="false"
             android:theme="@android:style/Theme.NoDisplay"
             android:noHistory="true"
             android:excludeFromRecents="true">
         </activity>
 
+        {% if enable_vr == "true" %}
+        <!-- Activity for dispatching intents to VR-enabled ChromeActivitys. This is necessary
+             because we can't return to CCT via a pendingIntent, which is how Daydream normally
+             launches an app after the DON flow. -->
+        <activity android:name="org.chromium.chrome.browser.vr_shell.VrProxyActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:noHistory="true"
+            android:excludeFromRecents="true"
+            android:relinquishTaskIdentity="true"
+            android:taskAffinity=""
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode" >
+            android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="org.chromium.chrome.browser.dummy.action" />
+                <category android:name="com.google.intent.category.DAYDREAM" />
+                <category android:name="com.google.intent.category.CARDBOARD" />
+            </intent-filter>
+        </activity>
+        {% endif %}
+
         <!-- Service for handling Nearby Messages -->
         <service android:name="org.chromium.chrome.browser.physicalweb.NearbyMessageIntentService"
             android:exported="false" />
 
         <!-- This activity is to expose the PhysicalWeb Share option via the generic Android share action. -->
         <activity
             android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebShareActivity"
             android:icon="@drawable/physical_web_notification_large"
             android:label="@string/physical_web_share_activity_title"
             android:enabled="false"
@@ skipping 332 matching lines @@
              choose the first MediaRouteController that can play it, so the order of the list can be important.
              The most specific MediaRouteControllers should be listed first, followed by more generic ones.
              The downstream manifest replaces this block, and hence replaces the list of media route
              controllers with its own list. -->
         <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS"
             android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
 
         {% endblock %}
     </application>
 </manifest>