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

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

Issue 1452603002: Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to more comments Created 5 years 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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 416
417 <!-- Provider for FileProvider. --> 417 <!-- Provider for FileProvider. -->
418 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 418 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
419 android:authorities="{{ manifest_package }}.FileProvider" 419 android:authorities="{{ manifest_package }}.FileProvider"
420 android:exported="false" 420 android:exported="false"
421 android:grantUriPermissions="true"> 421 android:grantUriPermissions="true">
422 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" 422 <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
423 android:resource="@xml/file_paths" /> 423 android:resource="@xml/file_paths" />
424 </provider> 424 </provider>
425 425
426 <provider android:name="org.chromium.chrome.browser.superviseduser.Super visedUserContentProvider"
427 android:authorities="{{ manifest_package }}.SupervisedUserProvider"
428 android:permission="android.permission.INTERNET"
429 android:exported="true">
430 </provider>
431
426 <!-- Sync adapter for browser invalidation. --> 432 <!-- Sync adapter for browser invalidation. -->
427 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService" 433 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService"
428 android:exported="false"> 434 android:exported="false">
429 <intent-filter> 435 <intent-filter>
430 <action android:name="android.content.SyncAdapter" /> 436 <action android:name="android.content.SyncAdapter" />
431 </intent-filter> 437 </intent-filter>
432 <meta-data android:name="android.content.SyncAdapter" 438 <meta-data android:name="android.content.SyncAdapter"
433 android:resource="@xml/syncadapter" /> 439 android:resource="@xml/syncadapter" />
434 </service> 440 </service>
435 441
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 690 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
685 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 691 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
686 The downstream manifest replaces this block, and hence replaces the list of media route 692 The downstream manifest replaces this block, and hence replaces the list of media route
687 controllers with its own list. --> 693 controllers with its own list. -->
688 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 694 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
689 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 695 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
690 696
691 {% endblock %} 697 {% endblock %}
692 </application> 698 </application>
693 </manifest> 699 </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