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

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

Issue 1144543009: [Android] Only invalidate objects that were received from Tango on resume. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +toString Created 5 years, 6 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 <!-- Provider for FileProvider. --> 178 <!-- Provider for FileProvider. -->
179 <provider android:name="android.support.v4.content.FileProvider" 179 <provider android:name="android.support.v4.content.FileProvider"
180 android:authorities="org.chromium.chrome.shell.FileProvider" 180 android:authorities="org.chromium.chrome.shell.FileProvider"
181 android:exported="false" 181 android:exported="false"
182 android:grantUriPermissions="true"> 182 android:grantUriPermissions="true">
183 <meta-data android:name="android.support.FILE_PROVIDER_PATHS" 183 <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
184 android:resource="@xml/file_paths" /> 184 android:resource="@xml/file_paths" />
185 </provider> 185 </provider>
186 186
187 <!-- Sync adapter for browser sync. --> 187 <!-- Sync adapter for browser invalidation. -->
188 <service android:exported="false" 188 <service android:exported="false"
189 android:name="org.chromium.chrome.shell.sync.ChromeShellSyncAda pterService"> 189 android:name="org.chromium.chrome.shell.invalidation.ChromeShel lSyncAdapterService">
190 <intent-filter> 190 <intent-filter>
191 <action android:name="android.content.SyncAdapter" /> 191 <action android:name="android.content.SyncAdapter" />
192 </intent-filter> 192 </intent-filter>
193 <meta-data android:name="android.content.SyncAdapter" 193 <meta-data android:name="android.content.SyncAdapter"
194 android:resource="@xml/syncadapter" /> 194 android:resource="@xml/syncadapter" />
195 </service> 195 </service>
196 196
197 <!-- Broadcast receiver that will be notified of account changes. --> 197 <!-- Broadcast receiver that will be notified of account changes. -->
198 <receiver android:name="org.chromium.chrome.shell.signin.AccountsChanged Receiver"> 198 <receiver android:name="org.chromium.chrome.shell.signin.AccountsChanged Receiver">
199 <intent-filter> 199 <intent-filter>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 <!-- Media route controllers to use for remote playback (cast). 235 <!-- Media route controllers to use for remote playback (cast).
236 This is here, rather than in code, since it varies between upstream and downstream, 236 This is here, rather than in code, since it varies between upstream and downstream,
237 yet we need this list of classes in the notification service, which belongs upstream 237 yet we need this list of classes in the notification service, which belongs upstream
238 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element, 238 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element,
239 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 239 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
240 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones --> 240 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones -->
241 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 241 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
242 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 242 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
243 </application> 243 </application>
244 </manifest> 244 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698