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

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

Issue 1305253006: [Custom Tabs]Add API for updating action button as ContentProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 413
414 <!-- Provider for FileProvider. --> 414 <!-- Provider for FileProvider. -->
415 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 415 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
416 android:authorities="{{ manifest_package }}.FileProvider" 416 android:authorities="{{ manifest_package }}.FileProvider"
417 android:exported="false" 417 android:exported="false"
418 android:grantUriPermissions="true"> 418 android:grantUriPermissions="true">
419 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" 419 <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
420 android:resource="@xml/file_paths" /> 420 android:resource="@xml/file_paths" />
421 </provider> 421 </provider>
422 422
423 <provider android:name="org.chromium.chrome.browser.customtabs.CustomTab Updater"
424 android:authorities="{{ manifest_package }}.CustomTabUpdate"
425 android:exported="true">
426 </provider>
427
423 <!-- Sync adapter for browser invalidation. --> 428 <!-- Sync adapter for browser invalidation. -->
424 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService" 429 <service android:name="org.chromium.chrome.browser.invalidation.ChromeBr owserSyncAdapterService"
425 android:exported="false"> 430 android:exported="false">
426 <intent-filter> 431 <intent-filter>
427 <action android:name="android.content.SyncAdapter" /> 432 <action android:name="android.content.SyncAdapter" />
428 </intent-filter> 433 </intent-filter>
429 <meta-data android:name="android.content.SyncAdapter" 434 <meta-data android:name="android.content.SyncAdapter"
430 android:resource="@xml/syncadapter" /> 435 android:resource="@xml/syncadapter" />
431 </service> 436 </service>
432 437
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 663 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
659 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 664 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
660 The downstream manifest replaces this block, and hence replaces the list of media route 665 The downstream manifest replaces this block, and hence replaces the list of media route
661 controllers with its own list. --> 666 controllers with its own list. -->
662 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 667 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
663 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 668 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
664 669
665 {% endblock %} 670 {% endblock %}
666 </application> 671 </application>
667 </manifest> 672 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698