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

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

Issue 1990233002: [Android backup] Restore nothing if signed in user isn't valid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to more comments Created 4 years, 6 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/ChromeBackupAgent.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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 {% block extra_keyset_definitions %} 95 {% block extra_keyset_definitions %}
96 {% endblock %} 96 {% endblock %}
97 97
98 <!-- Set android:largeHeap to "true" to allow more than the default 98 <!-- Set android:largeHeap to "true" to allow more than the default
99 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). --> 99 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
100 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}" 100 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}"
101 android:icon="@mipmap/app_icon" 101 android:icon="@mipmap/app_icon"
102 android:label="@string/app_name" 102 android:label="@string/app_name"
103 android:largeHeap="false" 103 android:largeHeap="false"
104 android:allowBackup="true" 104 android:allowBackup="true"
105 android:fullBackupContent="@xml/chromebackupscheme"
106 {% block android_backup_agent %}
105 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 107 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
106 android:fullBackupContent="@xml/chromebackupscheme" 108 {% endblock %}
107 android:supportsRtl="true" 109 android:supportsRtl="true"
108 {% block extra_application_attributes %}{% endblock %}> 110 {% block extra_application_attributes %}{% endblock %}>
109 111
110 <!-- Samsung MultiWindow Support --> 112 <!-- Samsung MultiWindow Support -->
111 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 113 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
112 android:value="true" /> 114 android:value="true" />
113 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 115 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
114 android:value="true" /> 116 android:value="true" />
115 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 117 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
116 android:value="singleTask" /> 118 android:value="singleTask" />
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 826 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
825 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 827 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
826 The downstream manifest replaces this block, and hence replaces the list of media route 828 The downstream manifest replaces this block, and hence replaces the list of media route
827 controllers with its own list. --> 829 controllers with its own list. -->
828 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 830 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
829 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 831 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
830 832
831 {% endblock %} 833 {% endblock %}
832 </application> 834 </application>
833 </manifest> 835 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgent.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698