diff options
| author | aberent <aberent@chromium.org> | 2015-06-29 07:43:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-29 14:44:04 +0000 |
| commit | c53da80809bb2eaa991abd6bf90790012662c3aa (patch) | |
| tree | c122ee05694f97af7e080de93dd0784c8312a932 | |
| parent | 518e46bc703661e7152312a9028c6a1ca13a3fa6 (diff) | |
| download | chromium_src-c53da80809bb2eaa991abd6bf90790012662c3aa.zip chromium_src-c53da80809bb2eaa991abd6bf90790012662c3aa.tar.gz chromium_src-c53da80809bb2eaa991abd6bf90790012662c3aa.tar.bz2 | |
Enable Cast in ChromePublic
Add the list of MediaRouteController to the ChromePublic manifest
(copied from the ChromeShell manifest) to enable Cast from ChromePublic.
BUG=505409
Review URL: https://codereview.chromium.org/1217823004
Cr-Commit-Position: refs/heads/master@{#336557}
| -rw-r--r-- | chrome/android/java/AndroidManifest.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml index 63c767a..d059b80 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -593,8 +593,20 @@ by a child template that "extends" this file. android:value="org.chromium.content.browser.SmartClipProvider"/> <meta-data android:name="org.chromium.components.service_tab_launcher.SERVICE_TAB_LAUNCHER" android:value="org.chromium.chrome.browser.ChromeServiceTabLauncher" /> - + {% 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 %} </application> </manifest> |