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

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

Issue 2542203002: [Android History] Add Android history manager UI and bridge (Closed)
Patch Set: Rebase, drop changes to time.* Created 4 years 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/drawable-hdpi/history_large.png » ('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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 </activity> 489 </activity>
490 490
491 <!-- Activities for downloads. --> 491 <!-- Activities for downloads. -->
492 <activity android:name="org.chromium.chrome.browser.download.DownloadAct ivity" 492 <activity android:name="org.chromium.chrome.browser.download.DownloadAct ivity"
493 android:theme="@style/FullscreenWhiteActivityTheme" 493 android:theme="@style/FullscreenWhiteActivityTheme"
494 android:windowSoftInputMode="stateAlwaysHidden" 494 android:windowSoftInputMode="stateAlwaysHidden"
495 android:exported="false" 495 android:exported="false"
496 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 496 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
497 </activity> 497 </activity>
498 498
499 <!-- Activities for history. -->
500 <activity android:name="org.chromium.chrome.browser.history.HistoryActiv ity"
501 android:theme="@style/FullscreenWhiteActivityTheme"
502 android:windowSoftInputMode="stateAlwaysHidden"
503 android:exported="false"
504 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
505 </activity>
506
499 <!-- 507 <!--
500 Activities for webapps. 508 Activities for webapps.
501 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure 509 TODO(dfalcantara): Remove the aliases for the WebappActivities once we're pretty sure
502 that users don't have any instances of the origin al Activity still 510 that users don't have any instances of the origin al Activity still
503 running. 511 running.
504 --> 512 -->
505 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity" 513 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch erActivity"
506 android:theme="@android:style/Theme.NoDisplay" 514 android:theme="@android:style/Theme.NoDisplay"
507 android:taskAffinity="" 515 android:taskAffinity=""
508 android:excludeFromRecents="true"> 516 android:excludeFromRecents="true">
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 963 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
956 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 964 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
957 The downstream manifest replaces this block, and hence replaces the list of media route 965 The downstream manifest replaces this block, and hence replaces the list of media route
958 controllers with its own list. --> 966 controllers with its own list. -->
959 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 967 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
960 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 968 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
961 969
962 {% endblock %} 970 {% endblock %}
963 </application> 971 </application>
964 </manifest> 972 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/drawable-hdpi/history_large.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698