Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 2980453002: [vr] Show DOFF when starting Chrome with a VR intent without FRE completion (Closed)
Patch Set: make VrFirstRunActivity conditional Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 415 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
416 </activity> 416 </activity>
417 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 417 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
418 android:theme="@style/DialogWhenLarge" 418 android:theme="@style/DialogWhenLarge"
419 android:launchMode="singleInstance" 419 android:launchMode="singleInstance"
420 android:excludeFromRecents="true" 420 android:excludeFromRecents="true"
421 android:autoRemoveFromRecents="true" 421 android:autoRemoveFromRecents="true"
422 android:windowSoftInputMode="stateHidden|adjustPan" 422 android:windowSoftInputMode="stateHidden|adjustPan"
423 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 423 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
424 </activity> 424 </activity>
425 {% if enable_vr == "true" %}
426 <activity android:name="org.chromium.chrome.browser.vr_shell.VrFirstRunA ctivity"
427 android:exported="false"
428 android:theme="@style/VrActivityTheme"
429 android:excludeFromRecents="true"
430 android:enableVrMode="@string/gvr_vr_mode_component"
431 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode">
432 {{ self.supports_vr() }}
433 </activity>
434 {% endif %}
425 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 435 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
426 android:theme="@style/DialogWhenLarge" 436 android:theme="@style/DialogWhenLarge"
427 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 437 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
428 </activity> 438 </activity>
429 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 439 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
430 android:theme="@style/PreferencesTheme" 440 android:theme="@style/PreferencesTheme"
431 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 441 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
432 android:label="@string/preferences" 442 android:label="@string/preferences"
433 android:exported="false"> 443 android:exported="false">
434 </activity> 444 </activity>
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 1062 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1053 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1063 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1054 The downstream manifest replaces this block, and hence replaces the list of media route 1064 The downstream manifest replaces this block, and hence replaces the list of media route
1055 controllers with its own list. --> 1065 controllers with its own list. -->
1056 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1066 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1057 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1067 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1058 1068
1059 {% endblock %} 1069 {% endblock %}
1060 </application> 1070 </application>
1061 </manifest> 1071 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698