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

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

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes for bauerb@'s and scherkus@'s comments Created 5 years, 9 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 2
3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 8
9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
10 package="org.chromium.chrome.shell"> 10 package="org.chromium.chrome.shell">
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 <action android:name="android.intent.action.VIEW" /> 58 <action android:name="android.intent.action.VIEW" />
59 <category android:name="android.intent.category.DEFAULT" /> 59 <category android:name="android.intent.category.DEFAULT" />
60 </intent-filter> 60 </intent-filter>
61 </activity> 61 </activity>
62 <activity android:theme="@style/PreferencesTheme" 62 <activity android:theme="@style/PreferencesTheme"
63 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references" 63 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references"
64 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize" 64 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize"
65 android:label="@string/preferences" 65 android:label="@string/preferences"
66 android:exported="false"> 66 android:exported="false">
67 </activity> 67 </activity>
68 68
whywhat 2015/03/13 19:25:48 nit: Some unintended ws change?
aberent 2015/03/17 21:33:51 Done.
69 <!-- The following service entries exist in order to allow us to 69 <!-- The following service entries exist in order to allow us to
70 start more than one sandboxed process. --> 70 start more than one sandboxed process. -->
71 71
72 <!-- NOTE: If you change the value of "android:process" for the below se rvices, 72 <!-- NOTE: If you change the value of "android:process" for the below se rvices,
73 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. --> 73 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. -->
74 {% set num_sandboxed_services = 20 %} 74 {% set num_sandboxed_services = 20 %}
75 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES" 75 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES"
76 android:value="{{ num_sandboxed_services }}"/> 76 android:value="{{ num_sandboxed_services }}"/>
77 {% for i in range(num_sandboxed_services) %} 77 {% for i in range(num_sandboxed_services) %}
78 <service android:name="org.chromium.content.app.SandboxedProcessService{ { i }}" 78 <service android:name="org.chromium.content.app.SandboxedProcessService{ { i }}"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 <intent-filter> 185 <intent-filter>
186 <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" / > 186 <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" / >
187 </intent-filter> 187 </intent-filter>
188 </receiver> 188 </receiver>
189 189
190 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 190 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
191 android:value="org.chromium.content.browser.SmartClipProvider " /> 191 android:value="org.chromium.content.browser.SmartClipProvider " />
192 <meta-data android:name="org.chromium.chrome.browser.SERVICE_TAB_LAUNCHE R" 192 <meta-data android:name="org.chromium.chrome.browser.SERVICE_TAB_LAUNCHE R"
193 android:value="org.chromium.chrome.shell.ChromeShellServiceTa bLauncher" /> 193 android:value="org.chromium.chrome.shell.ChromeShellServiceTa bLauncher" />
194 194
195 <!-- Activity, service, and meta-data to support casting to Chromecast - ->
196
197 <!-- Expanded controller activity is displayed when the Cast Notificatio n is clicked -->
198 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
199 android:theme="@style/MainTheme"
200 android:label="Chrome.ExpandedControllerActivity"
201 android:hardwareAccelerated="true"
202 android:launchMode="singleTask"
203 android:noHistory="true"
204 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e"
205 android:excludeFromRecents="true">
206 </activity>
207
208 <service android:name="org.chromium.chrome.browser.media.remote.Notifica tionTransportControl$ListenerService" />
209
210 <!-- Media route controllers to use for remote playback (cast).
211 This is here, rather than in code, since it varies between upstream and downstream,
212 yet we need this list of classes in the notification service, which belongs upstream
213 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element,
214 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
215 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones -->
216 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
217 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
218
219
195 </application> 220 </application>
196 </manifest> 221 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698