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

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

Issue 1224553003: customtabs: Convert to the new AIDL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add safePutBinder and a session extra in the testing activity. Created 5 years, 5 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 </intent-filter> 529 </intent-filter>
530 </receiver> 530 </receiver>
531 531
532 <service android:name="org.chromium.chrome.browser.prerender.ChromePrere nderService" 532 <service android:name="org.chromium.chrome.browser.prerender.ChromePrere nderService"
533 android:exported="true" 533 android:exported="true"
534 tools:ignore="ExportedService" /> 534 tools:ignore="ExportedService" />
535 <service android:name="org.chromium.chrome.browser.customtabs.CustomTabs ConnectionService" 535 <service android:name="org.chromium.chrome.browser.customtabs.CustomTabs ConnectionService"
536 android:exported="{{ 'true' if channel in ['dev', 'canary', 'defaul t'] else 'false' }}" 536 android:exported="{{ 'true' if channel in ['dev', 'canary', 'defaul t'] else 'false' }}"
537 tools:ignore="ExportedService"> 537 tools:ignore="ExportedService">
538 <intent-filter> 538 <intent-filter>
539 <action android:name="android.intent.action.MAIN" /> 539 <action android:name="android.support.customtabs.action.CustomTabs Service" />
540 <category android:name="android.intent.category.CUSTOM_TABS" />
541 </intent-filter> 540 </intent-filter>
542 </service> 541 </service>
543 <service android:name="org.chromium.chrome.browser.crash.LogcatExtractio nService" 542 <service android:name="org.chromium.chrome.browser.crash.LogcatExtractio nService"
544 android:exported="false"/> 543 android:exported="false"/>
545 <service android:name="org.chromium.chrome.browser.crash.MinidumpPrepara tionService" 544 <service android:name="org.chromium.chrome.browser.crash.MinidumpPrepara tionService"
546 android:exported="false"/> 545 android:exported="false"/>
547 <service android:name="org.chromium.chrome.browser.crash.MinidumpUploadS ervice" 546 <service android:name="org.chromium.chrome.browser.crash.MinidumpUploadS ervice"
548 android:exported="false"/> 547 android:exported="false"/>
549 548
550 <service android:name="org.chromium.chrome.browser.omaha.OmahaClient" 549 <service android:name="org.chromium.chrome.browser.omaha.OmahaClient"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 616 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
618 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 617 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
619 The downstream manifest replaces this block, and hence replaces the list of media route 618 The downstream manifest replaces this block, and hence replaces the list of media route
620 controllers with its own list. --> 619 controllers with its own list. -->
621 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 620 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
622 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 621 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
623 622
624 {% endblock %} 623 {% endblock %}
625 </application> 624 </application>
626 </manifest> 625 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698