| OLD | NEW |
| 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAd
dEditFolderActivity" | 353 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAd
dEditFolderActivity" |
| 354 android:theme="@style/BookmarkDialogWhite" | 354 android:theme="@style/BookmarkDialogWhite" |
| 355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz
e|mcc|mnc|screenLayout|smallestScreenSize"> | 355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz
e|mcc|mnc|screenLayout|smallestScreenSize"> |
| 356 </activity> | 356 </activity> |
| 357 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo
lderSelectActivity" | 357 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkFo
lderSelectActivity" |
| 358 android:theme="@style/BookmarkDialogWhite" | 358 android:theme="@style/BookmarkDialogWhite" |
| 359 android:windowSoftInputMode="stateAlwaysHidden" | 359 android:windowSoftInputMode="stateAlwaysHidden" |
| 360 android:label="@string/bookmark_choose_folder" | 360 android:label="@string/bookmark_choose_folder" |
| 361 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz
e|mcc|mnc|screenLayout|smallestScreenSize"> | 361 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz
e|mcc|mnc|screenLayout|smallestScreenSize"> |
| 362 </activity> | 362 </activity> |
| 363 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkSi
gninActivity" | |
| 364 android:theme="@style/BookmarkDialogWhite" | |
| 365 android:screenOrientation="portrait" | |
| 366 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz
e|mcc|mnc|screenLayout|smallestScreenSize"> | |
| 367 </activity> | |
| 368 | 363 |
| 369 <!-- | 364 <!-- |
| 370 Activities for webapps. | 365 Activities for webapps. |
| 371 TODO(dfalcantara): Remove the aliases for the WebappActivities once
we're pretty sure | 366 TODO(dfalcantara): Remove the aliases for the WebappActivities once
we're pretty sure |
| 372 that users don't have any instances of the origin
al Activity still | 367 that users don't have any instances of the origin
al Activity still |
| 373 running. | 368 running. |
| 374 --> | 369 --> |
| 375 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch
erActivity" | 370 <activity android:name="org.chromium.chrome.browser.webapps.WebappLaunch
erActivity" |
| 376 android:theme="@android:style/Theme.NoDisplay" | 371 android:theme="@android:style/Theme.NoDisplay" |
| 377 android:taskAffinity="" | 372 android:taskAffinity="" |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 806 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. | 801 choose the first MediaRouteController that can play it, so the orde
r of the list can be important. |
| 807 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones. | 802 The most specific MediaRouteControllers should be listed first, fol
lowed by more generic ones. |
| 808 The downstream manifest replaces this block, and hence replaces the
list of media route | 803 The downstream manifest replaces this block, and hence replaces the
list of media route |
| 809 controllers with its own list. --> | 804 controllers with its own list. --> |
| 810 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" | 805 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE
RS" |
| 811 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> | 806 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia
RouteController"/> |
| 812 | 807 |
| 813 {% endblock %} | 808 {% endblock %} |
| 814 </application> | 809 </application> |
| 815 </manifest> | 810 </manifest> |
| OLD | NEW |