Index: chrome/android/shell/java/AndroidManifest.xml.jinja2 |
diff --git a/chrome/android/shell/java/AndroidManifest.xml.jinja2 b/chrome/android/shell/java/AndroidManifest.xml.jinja2 |
index c91196e7e13804dba3fc1548a71783ae3bc47fc6..860427c5524095ba90a5fa5ca060a527a6c9b259 100644 |
--- a/chrome/android/shell/java/AndroidManifest.xml.jinja2 |
+++ b/chrome/android/shell/java/AndroidManifest.xml.jinja2 |
@@ -65,7 +65,7 @@ |
android:label="@string/preferences" |
android:exported="false"> |
</activity> |
- |
+ |
whywhat
2015/03/13 19:25:48
nit: Some unintended ws change?
aberent
2015/03/17 21:33:51
Done.
|
<!-- The following service entries exist in order to allow us to |
start more than one sandboxed process. --> |
@@ -192,5 +192,30 @@ |
<meta-data android:name="org.chromium.chrome.browser.SERVICE_TAB_LAUNCHER" |
android:value="org.chromium.chrome.shell.ChromeShellServiceTabLauncher" /> |
+ <!-- Activity, service, and meta-data to support casting to Chromecast --> |
+ |
+ <!-- Expanded controller activity is displayed when the Cast Notification is clicked --> |
+ <activity android:name="org.chromium.chrome.browser.media.remote.ExpandedControllerActivity" |
+ android:theme="@style/MainTheme" |
+ android:label="Chrome.ExpandedControllerActivity" |
+ android:hardwareAccelerated="true" |
+ android:launchMode="singleTask" |
+ android:noHistory="true" |
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize" |
+ android:excludeFromRecents="true"> |
+ </activity> |
+ |
+ <service android:name="org.chromium.chrome.browser.media.remote.NotificationTransportControl$ListenerService" /> |
+ |
+ <!-- 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 Clank 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 --> |
+ <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" |
+ android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/> |
+ |
+ |
</application> |
</manifest> |