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

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

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

Powered by Google App Engine
This is Rietveld 408576698