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

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

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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 | « chrome/android/chrome_public_apk_tmpl.gni ('k') | chrome/app/BUILD.gn » ('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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 108 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
109 android:value="true" /> 109 android:value="true" />
110 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 110 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
111 android:value="singleTask" /> 111 android:value="singleTask" />
112 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 112 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
113 android:value="true"/> 113 android:value="true"/>
114 114
115 {% if channel in ['dev', 'canary', 'default'] %} 115 {% if channel in ['dev', 'canary', 'default'] %}
116 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> 116 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" />
117 {% endif %} 117 {% endif %}
118 {% if configuration_policy == '1' %}
118 <meta-data android:name="android.content.APP_RESTRICTIONS" 119 <meta-data android:name="android.content.APP_RESTRICTIONS"
119 android:resource="@xml/app_restrictions"/> 120 android:resource="@xml/app_restrictions"/>
121 {% endif %}
120 122
121 <!-- Note: All activities directly or indirectly derived from ChromeActi vity 123 <!-- Note: All activities directly or indirectly derived from ChromeActi vity
122 must specify android:hardwareAccelerated="false". 124 must specify android:hardwareAccelerated="false".
123 125
124 Since this activity (shown in the launcher) and the application 126 Since this activity (shown in the launcher) and the application
125 (shown in Android's Settings/Apps list) share the same label, we 127 (shown in Android's Settings/Apps list) share the same label, we
126 do not specify one here to allow it to inherit from the app. --> 128 do not specify one here to allow it to inherit from the app. -->
127 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity" 129 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity"
128 android:theme="@android:style/Theme.Translucent.NoTitleBar"> 130 android:theme="@android:style/Theme.Translucent.NoTitleBar">
129 </activity> 131 </activity>
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 762 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
761 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 763 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
762 The downstream manifest replaces this block, and hence replaces the list of media route 764 The downstream manifest replaces this block, and hence replaces the list of media route
763 controllers with its own list. --> 765 controllers with its own list. -->
764 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 766 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
765 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 767 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
766 768
767 {% endblock %} 769 {% endblock %}
768 </application> 770 </application>
769 </manifest> 771 </manifest>
OLDNEW
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | chrome/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698