New Compositor and tab content

chrome/android/java/AndroidManifest.xml

Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index a374a2ca2880bd007da8a2c6718a640f228d7c21..827fbab29de3d02b34e688664082471f8728e77f 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -346,10 +346,11 @@ by a child template that "extends" this file.
              android:hardwareAccelerated="false">
         </activity>
         {% if enable_vr_shell == "true" %}
-        <activity android:name="org.chromium.chrome.browser.VrActivity"
-             android:theme="@style/MainTheme"
+        <activity-alias android:name="org.chromium.chrome.browser.VrActivity"
+             android:theme="@style/TabbedModeTheme"
              android:windowSoftInputMode="stateAlwaysHidden"
              android:launchMode="singleTask"
+             android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActivity"
              android:screenOrientation="landscape"
              android:hardwareAccelerated="false"
              android:exported="true">
@@ -359,8 +360,9 @@ by a child template that "extends" this file.
                 <!-- Show icon in Daydream app launcher. -->
                 <category android:name="com.google.intent.category.DAYDREAM" />
            </intent-filter>
-        </activity>
+        </activity-alias>
         {% endif %}
+
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
              android:theme="@style/TabbedModeTheme"
              android:exported="false"