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

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: Reply to more comments including changing interthread communication 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
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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 415
416 <!-- Provider for FileProvider. --> 416 <!-- Provider for FileProvider. -->
417 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 417 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
418 android:authorities="{{ manifest_package }}.FileProvider" 418 android:authorities="{{ manifest_package }}.FileProvider"
419 android:exported="false" 419 android:exported="false"
420 android:grantUriPermissions="true"> 420 android:grantUriPermissions="true">
421 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" 421 <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
422 android:resource="@xml/file_paths" /> 422 android:resource="@xml/file_paths" />
423 </provider> 423 </provider>
424 424
425 <provider android:name="org.chromium.chrome.browser.superviseduser.Super visedUserContentProvider"
426 android:authorities="{{ manifest_package }}.SupervisedUserProvider"
427 android:permission="android.permission.INTERNET"
428 android:exported="true">
429 </provider>
430
425 <!-- Sync adapter for browser invalidation. --> 431 <!-- Sync adapter for browser invalidation. -->
426 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService" 432 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService"
427 android:exported="false"> 433 android:exported="false">
428 <intent-filter> 434 <intent-filter>
429 <action android:name="android.content.SyncAdapter" /> 435 <action android:name="android.content.SyncAdapter" />
430 </intent-filter> 436 </intent-filter>
431 <meta-data android:name="android.content.SyncAdapter" 437 <meta-data android:name="android.content.SyncAdapter"
432 android:resource="@xml/syncadapter" /> 438 android:resource="@xml/syncadapter" />
433 </service> 439 </service>
434 440
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 684 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
679 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 685 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
680 The downstream manifest replaces this block, and hence replaces the list of media route 686 The downstream manifest replaces this block, and hence replaces the list of media route
681 controllers with its own list. --> 687 controllers with its own list. -->
682 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 688 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
683 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 689 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
684 690
685 {% endblock %} 691 {% endblock %}
686 </application> 692 </application>
687 </manifest> 693 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698