Commit 1cece467 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Remove obsolete metadata tag for media router.

Bug: 790766
Change-Id: I85fe845d3aa8b2584e7bd4877b7d80f1ee5ca3c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511878Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823417}
parent fffc75e9
...@@ -836,7 +836,6 @@ ...@@ -836,7 +836,6 @@
<meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/> <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/>
<meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="5"/> <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="5"/>
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/> <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/> <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/> <meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: a5e78e63 <provider # DIFF-ANCHOR: a5e78e63
......
...@@ -790,7 +790,6 @@ ...@@ -790,7 +790,6 @@
<meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/> <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.enable" android:value="true"/>
<meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="5"/> <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES" android:value="5"/>
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/> <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/> <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/> <meta-data android:name="preloaded_fonts" android:resource="@array/chrome_preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: 97e158a1 <provider # DIFF-ANCHOR: 97e158a1
......
...@@ -1166,18 +1166,6 @@ by a child template that "extends" this file. ...@@ -1166,18 +1166,6 @@ by a child template that "extends" this file.
</activity> </activity>
{% endif %} {% endif %}
{% block extra_application_definitions %}
<!-- Media route controllers to use for remote playback (cast).
This is here, rather than in code, since it varies between upstream and downstream,
yet we need this list of classes in the notification service, which belongs upstream
and doesn't run the downstream startup code. The Cast code will, for each media element,
choose the first MediaRouteController that can play it, so the order of the list can be important.
The most specific MediaRouteControllers should be listed first, followed by more generic ones.
The downstream manifest replaces this block, and hence replaces the list of media route
controllers with its own list. -->
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS"
android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
{% endblock %}
{% endmacro %} {% endmacro %}
{% if not definitions_in_split %} {% if not definitions_in_split %}
{{ application_definitions() }} {{ application_definitions() }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment