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

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

Issue 1215713021: Reverted the code for the non-interactive audible tab notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notification
Patch Set: Rebased 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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 <action android:name="android.intent.action.ACTION_POWER_CONNECT ED"/> 618 <action android:name="android.intent.action.ACTION_POWER_CONNECT ED"/>
619 <action android:name="android.intent.action.ACTION_POWER_DISCONN ECTED"/> 619 <action android:name="android.intent.action.ACTION_POWER_DISCONN ECTED"/>
620 </intent-filter> 620 </intent-filter>
621 </receiver> 621 </receiver>
622 622
623 <service android:name="org.chromium.chrome.browser.media.remote.Notifica tionTransportControl$ListenerService" /> 623 <service android:name="org.chromium.chrome.browser.media.remote.Notifica tionTransportControl$ListenerService" />
624 624
625 <!-- Receiver for lock screen input when casting --> 625 <!-- Receiver for lock screen input when casting -->
626 <receiver android:name="org.chromium.chrome.browser.media.remote.LockScr eenTransportControl$MediaButtonIntentReceiver"/> 626 <receiver android:name="org.chromium.chrome.browser.media.remote.LockScr eenTransportControl$MediaButtonIntentReceiver"/>
627 627
628 <service android:name="org.chromium.chrome.browser.media.MediaNotificati onService" 628 <service android:name="org.chromium.chrome.browser.media.MediaCaptureNot ificationService"
629 android:exported="false"/> 629 android:exported="false"/>
630 <service android:name="org.chromium.chrome.browser.media.ui.Notification MediaPlaybackControls$ListenerService" 630 <service android:name="org.chromium.chrome.browser.media.ui.Notification MediaPlaybackControls$ListenerService"
631 android:exported="false"/> 631 android:exported="false"/>
632 632
633 <meta-data android:name="com.google.android.gms.version" 633 <meta-data android:name="com.google.android.gms.version"
634 android:value="@integer/google_play_services_version" /> 634 android:value="@integer/google_play_services_version" />
635 635
636 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 636 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
637 android:value="org.chromium.content.browser.SmartClipProvider"/> 637 android:value="org.chromium.content.browser.SmartClipProvider"/>
638 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER" 638 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER"
639 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" /> 639 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" />
640 640
641 {% block extra_application_definitions %} 641 {% block extra_application_definitions %}
642 642
643 <!-- Media route controllers to use for remote playback (cast). 643 <!-- Media route controllers to use for remote playback (cast).
644 This is here, rather than in code, since it varies between upstream and downstream, 644 This is here, rather than in code, since it varies between upstream and downstream,
645 yet we need this list of classes in the notification service, which belongs upstream 645 yet we need this list of classes in the notification service, which belongs upstream
646 and doesn't run the downstream startup code. The Cast code will, fo r each media element, 646 and doesn't run the downstream startup code. The Cast code will, fo r each media element,
647 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 647 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
648 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 648 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
649 The downstream manifest replaces this block, and hence replaces the list of media route 649 The downstream manifest replaces this block, and hence replaces the list of media route
650 controllers with its own list. --> 650 controllers with its own list. -->
651 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 651 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
652 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 652 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
653 653
654 {% endblock %} 654 {% endblock %}
655 </application> 655 </application>
656 </manifest> 656 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698