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

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

Issue 1652163002: Refactor Clank cast code to use MediaNotificationManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@MediaUi
Patch Set: Respond to Mounir's comments Created 4 years, 10 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 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 </intent-filter> 650 </intent-filter>
651 </receiver> 651 </receiver>
652 652
653 <receiver android:name="org.chromium.base.PowerStatusReceiver"> 653 <receiver android:name="org.chromium.base.PowerStatusReceiver">
654 <intent-filter> 654 <intent-filter>
655 <action android:name="android.intent.action.ACTION_POWER_CONNECT ED"/> 655 <action android:name="android.intent.action.ACTION_POWER_CONNECT ED"/>
656 <action android:name="android.intent.action.ACTION_POWER_DISCONN ECTED"/> 656 <action android:name="android.intent.action.ACTION_POWER_DISCONN ECTED"/>
657 </intent-filter> 657 </intent-filter>
658 </receiver> 658 </receiver>
659 659
660 <service android:name="org.chromium.chrome.browser.media.remote.Notifica tionTransportControl$ListenerService" />
661
662 <!-- Receiver for lock screen input when casting -->
663 <receiver android:name="org.chromium.chrome.browser.media.remote.LockScr eenTransportControl$MediaButtonIntentReceiver"/>
664
665 <service android:name="org.chromium.chrome.browser.media.MediaCaptureNot ificationService" 660 <service android:name="org.chromium.chrome.browser.media.MediaCaptureNot ificationService"
666 android:exported="false"/> 661 android:exported="false"/>
667 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PlaybackListenerService" 662 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PlaybackListenerService"
668 android:exported="false"> 663 android:exported="false">
669 <intent-filter> 664 <intent-filter>
670 <action android:name="android.intent.action.MEDIA_BUTTON" /> 665 <action android:name="android.intent.action.MEDIA_BUTTON" />
671 </intent-filter> 666 </intent-filter>
672 </service> 667 </service>
673 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PresentationListenerService" 668 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$PresentationListenerService"
674 android:exported="false"> 669 android:exported="false">
675 <intent-filter> 670 <intent-filter>
676 <action android:name="android.intent.action.MEDIA_BUTTON" /> 671 <action android:name="android.intent.action.MEDIA_BUTTON" />
677 </intent-filter> 672 </intent-filter>
678 </service> 673 </service>
674 <service android:name="org.chromium.chrome.browser.media.ui.MediaNotific ationManager$CastListenerService"
675 android:exported="false">
676 <intent-filter>
677 <action android:name="android.intent.action.MEDIA_BUTTON" />
678 </intent-filter>
679 </service>
mlamouri (slow - plz ping) 2016/02/03 14:47:18 You are adding these classes in the other CL. Shou
aberent 2016/02/04 14:36:47 Maybe should have been, but the other one is now l
679 680
680 681
681 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PlaybackMediaButtonReceiver"> 682 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PlaybackMediaButtonReceiver">
682 <intent-filter> 683 <intent-filter>
683 <action android:name="android.intent.action.MEDIA_BUTTON" /> 684 <action android:name="android.intent.action.MEDIA_BUTTON" />
684 </intent-filter> 685 </intent-filter>
685 </receiver> 686 </receiver>
686 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PresentationMediaButtonReceiver"> 687 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$PresentationMediaButtonReceiver">
687 <intent-filter> 688 <intent-filter>
688 <action android:name="android.intent.action.MEDIA_BUTTON" /> 689 <action android:name="android.intent.action.MEDIA_BUTTON" />
689 </intent-filter> 690 </intent-filter>
690 </receiver> 691 </receiver>
692 <receiver android:name="org.chromium.chrome.browser.media.ui.MediaNotifi cationManager$CastMediaButtonReceiver">
693 <intent-filter>
694 <action android:name="android.intent.action.MEDIA_BUTTON" />
695 </intent-filter>
696 </receiver>
691 697
692 698
693 <meta-data android:name="com.google.android.gms.version" 699 <meta-data android:name="com.google.android.gms.version"
694 android:value="@integer/google_play_services_version" /> 700 android:value="@integer/google_play_services_version" />
695 701
696 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 702 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
697 android:value="org.chromium.content.browser.SmartClipProvider"/> 703 android:value="org.chromium.content.browser.SmartClipProvider"/>
698 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER" 704 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER"
699 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" /> 705 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" />
700 706
701 {% block extra_application_definitions %} 707 {% block extra_application_definitions %}
702 708
703 <!-- Media route controllers to use for remote playback (cast). 709 <!-- Media route controllers to use for remote playback (cast).
704 This is here, rather than in code, since it varies between upstream and downstream, 710 This is here, rather than in code, since it varies between upstream and downstream,
705 yet we need this list of classes in the notification service, which belongs upstream 711 yet we need this list of classes in the notification service, which belongs upstream
706 and doesn't run the downstream startup code. The Cast code will, fo r each media element, 712 and doesn't run the downstream startup code. The Cast code will, fo r each media element,
707 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 713 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
708 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 714 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
709 The downstream manifest replaces this block, and hence replaces the list of media route 715 The downstream manifest replaces this block, and hence replaces the list of media route
710 controllers with its own list. --> 716 controllers with its own list. -->
711 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 717 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
712 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 718 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
713 719
714 {% endblock %} 720 {% endblock %}
715 </application> 721 </application>
716 </manifest> 722 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698