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

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

Issue 1242323003: Remove PrerenderService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 android:theme="@style/PreferencesTheme" 272 android:theme="@style/PreferencesTheme"
273 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 273 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
274 android:label="@string/preferences" 274 android:label="@string/preferences"
275 android:exported="false"> 275 android:exported="false">
276 </activity> 276 </activity>
277 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 277 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
278 android:theme="@style/ThemeWithActionBar" 278 android:theme="@style/ThemeWithActionBar"
279 android:hardwareAccelerated="true" 279 android:hardwareAccelerated="true"
280 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 280 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
281 </activity> 281 </activity>
282 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
283 android:theme="@style/MainTheme"
284 android:exported="true">
285 </activity>
286 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity" 282 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity"
287 android:theme="@style/EnhancedBookmarkDialog" 283 android:theme="@style/EnhancedBookmarkDialog"
288 android:windowSoftInputMode="stateAlwaysHidden" 284 android:windowSoftInputMode="stateAlwaysHidden"
289 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 285 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
290 </activity> 286 </activity>
291 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkEditActivity" 287 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkEditActivity"
292 android:theme="@style/EnhancedBookmarkDialogWhite" 288 android:theme="@style/EnhancedBookmarkDialogWhite"
293 android:label="@string/edit_bookmark" 289 android:label="@string/edit_bookmark"
294 android:windowSoftInputMode="stateHidden" 290 android:windowSoftInputMode="stateHidden"
295 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 291 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 522
527 <!-- Service Worker Background Sync service listener --> 523 <!-- Service Worker Background Sync service listener -->
528 <service android:name="org.chromium.content.browser.BackgroundSyncLaunch erService" 524 <service android:name="org.chromium.content.browser.BackgroundSyncLaunch erService"
529 android:exported="false" /> 525 android:exported="false" />
530 <receiver android:name="org.chromium.content.browser.BackgroundSyncLaunc herService$Receiver"> 526 <receiver android:name="org.chromium.content.browser.BackgroundSyncLaunc herService$Receiver">
531 <intent-filter> 527 <intent-filter>
532 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> 528 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
533 </intent-filter> 529 </intent-filter>
534 </receiver> 530 </receiver>
535 531
536 <service android:name="org.chromium.chrome.browser.prerender.ChromePrere nderService"
537 android:exported="true"
538 tools:ignore="ExportedService" />
539 <service android:name="org.chromium.chrome.browser.customtabs.CustomTabs ConnectionService" 532 <service android:name="org.chromium.chrome.browser.customtabs.CustomTabs ConnectionService"
540 android:exported="{{ 'true' if channel in ['dev', 'canary', 'defaul t'] else 'false' }}" 533 android:exported="{{ 'true' if channel in ['dev', 'canary', 'defaul t'] else 'false' }}"
541 tools:ignore="ExportedService"> 534 tools:ignore="ExportedService">
542 <intent-filter> 535 <intent-filter>
543 <action android:name="android.support.customtabs.action.CustomTabs Service" /> 536 <action android:name="android.support.customtabs.action.CustomTabs Service" />
544 </intent-filter> 537 </intent-filter>
545 </service> 538 </service>
546 <service android:name="org.chromium.chrome.browser.crash.LogcatExtractio nService" 539 <service android:name="org.chromium.chrome.browser.crash.LogcatExtractio nService"
547 android:exported="false"/> 540 android:exported="false"/>
548 <service android:name="org.chromium.chrome.browser.crash.MinidumpPrepara tionService" 541 <service android:name="org.chromium.chrome.browser.crash.MinidumpPrepara tionService"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 613 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
621 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 614 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
622 The downstream manifest replaces this block, and hence replaces the list of media route 615 The downstream manifest replaces this block, and hence replaces the list of media route
623 controllers with its own list. --> 616 controllers with its own list. -->
624 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 617 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
625 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 618 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
626 619
627 {% endblock %} 620 {% endblock %}
628 </application> 621 </application>
629 </manifest> 622 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698