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

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

Issue 1552333002: Resubmit Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual rebase to fix merge problem Created 4 years, 11 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/BUILD.gn ('k') | chrome/android/java/DEPS » ('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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 424
425 <!-- Provider for FileProvider. --> 425 <!-- Provider for FileProvider. -->
426 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 426 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
427 android:authorities="{{ manifest_package }}.FileProvider" 427 android:authorities="{{ manifest_package }}.FileProvider"
428 android:exported="false" 428 android:exported="false"
429 android:grantUriPermissions="true"> 429 android:grantUriPermissions="true">
430 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" 430 <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
431 android:resource="@xml/file_paths" /> 431 android:resource="@xml/file_paths" />
432 </provider> 432 </provider>
433 433
434 <provider android:name="org.chromium.chrome.browser.superviseduser.Super visedUserContentProvider"
435 android:authorities="{{ manifest_package }}.SupervisedUserProvider"
436 android:permission="android.permission.INTERNET"
437 android:exported="true">
438 </provider>
439
434 <!-- Sync adapter for browser invalidation. --> 440 <!-- Sync adapter for browser invalidation. -->
435 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService" 441 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService"
436 android:exported="false"> 442 android:exported="false">
437 <intent-filter> 443 <intent-filter>
438 <action android:name="android.content.SyncAdapter" /> 444 <action android:name="android.content.SyncAdapter" />
439 </intent-filter> 445 </intent-filter>
440 <meta-data android:name="android.content.SyncAdapter" 446 <meta-data android:name="android.content.SyncAdapter"
441 android:resource="@xml/syncadapter" /> 447 android:resource="@xml/syncadapter" />
442 </service> 448 </service>
443 449
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 698 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
693 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 699 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
694 The downstream manifest replaces this block, and hence replaces the list of media route 700 The downstream manifest replaces this block, and hence replaces the list of media route
695 controllers with its own list. --> 701 controllers with its own list. -->
696 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 702 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
697 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 703 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
698 704
699 {% endblock %} 705 {% endblock %}
700 </application> 706 </application>
701 </manifest> 707 </manifest>
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698