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

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

Issue 2445133002: Enusre elderberry tabs remain after upgrade. (Closed)
Patch Set: Created 4 years, 1 month 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/document/ChromeLauncherActivity.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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 android:exported="false" 321 android:exported="false"
322 android:windowSoftInputMode="adjustResize" 322 android:windowSoftInputMode="adjustResize"
323 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 323 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
324 android:hardwareAccelerated="false"> 324 android:hardwareAccelerated="false">
325 </activity> 325 </activity>
326 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity" 326 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity"
327 android:theme="@style/MainTheme" 327 android:theme="@style/MainTheme"
328 android:exported="false" 328 android:exported="false"
329 android:taskAffinity="" 329 android:taskAffinity=""
330 android:windowSoftInputMode="adjustResize" 330 android:windowSoftInputMode="adjustResize"
331 android:persistableMode="persistNever"
332 android:autoRemoveFromRecents="false"
331 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 333 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
332 android:hardwareAccelerated="false"> 334 android:hardwareAccelerated="false">
333 </activity> 335 </activity>
334 {% for i in range(10) %} 336 {% for i in range(10) %}
335 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}" 337 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}"
336 android:theme="@style/MainTheme" 338 android:theme="@style/MainTheme"
337 android:icon="@mipmap/app_single_page_icon" 339 android:icon="@mipmap/app_single_page_icon"
338 android:exported="false" 340 android:exported="false"
339 android:launchMode="singleTask" 341 android:launchMode="singleTask"
340 android:windowSoftInputMode="adjustResize" 342 android:windowSoftInputMode="adjustResize"
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 915 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
914 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 916 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
915 The downstream manifest replaces this block, and hence replaces the list of media route 917 The downstream manifest replaces this block, and hence replaces the list of media route
916 controllers with its own list. --> 918 controllers with its own list. -->
917 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 919 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
918 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 920 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
919 921
920 {% endblock %} 922 {% endblock %}
921 </application> 923 </application>
922 </manifest> 924 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698