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

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

Issue 2086483004: Remove ChromePrerenderService, keeping only its skeleton behind. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Explain why the service is staying. Created 4 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
« no previous file with comments | « no previous file | chrome/android/java/res/layout/prerender_test_main.xml » ('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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 android:theme="@style/PreferencesTheme" 333 android:theme="@style/PreferencesTheme"
334 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 334 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
335 android:label="@string/storage_management_activity_label" 335 android:label="@string/storage_management_activity_label"
336 android:exported="false"> 336 android:exported="false">
337 </activity> 337 </activity>
338 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 338 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
339 android:theme="@style/ThemeWithActionBar" 339 android:theme="@style/ThemeWithActionBar"
340 android:hardwareAccelerated="false" 340 android:hardwareAccelerated="false"
341 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 341 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
342 </activity> 342 </activity>
343 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
344 android:theme="@style/MainTheme"
345 android:exported="true">
346 </activity>
347 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" 343 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity"
348 android:theme="@style/DrawerDialog" 344 android:theme="@style/DrawerDialog"
349 android:windowSoftInputMode="stateAlwaysHidden" 345 android:windowSoftInputMode="stateAlwaysHidden"
350 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 346 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
351 </activity> 347 </activity>
352 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAd dActivity" 348 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAd dActivity"
353 android:theme="@style/DrawerDialogWhite" 349 android:theme="@style/DrawerDialogWhite"
354 android:windowSoftInputMode="stateHidden" 350 android:windowSoftInputMode="stateHidden"
355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 351 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
356 <intent-filter> 352 <intent-filter>
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 841 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
846 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 842 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
847 The downstream manifest replaces this block, and hence replaces the list of media route 843 The downstream manifest replaces this block, and hence replaces the list of media route
848 controllers with its own list. --> 844 controllers with its own list. -->
849 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 845 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
850 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 846 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
851 847
852 {% endblock %} 848 {% endblock %}
853 </application> 849 </application>
854 </manifest> 850 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/layout/prerender_test_main.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698