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

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

Issue 2905073002: Revert of Redirecting off-origin navigations in PWAs to CCT. (Closed)
Patch Set: Created 3 years, 7 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/contextmenu/ChromeContextMenuPopulator.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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> 479 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" />
480 <category android:name="android.intent.category.DEFAULT" /> 480 <category android:name="android.intent.category.DEFAULT" />
481 </intent-filter> 481 </intent-filter>
482 </activity> 482 </activity>
483 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager" 483 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager"
484 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity"> 484 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity">
485 </activity-alias> 485 </activity-alias>
486 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" 486 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty"
487 android:theme="@style/WebappTheme" 487 android:theme="@style/WebappTheme"
488 android:label="@string/webapp_activity_title" 488 android:label="@string/webapp_activity_title"
489 android:launchMode="singleTop"
490 android:documentLaunchMode="intoExisting" 489 android:documentLaunchMode="intoExisting"
491 android:persistableMode="persistNever" 490 android:persistableMode="persistNever"
492 {{ self.supports_video_persistence() }} 491 {{ self.supports_video_persistence() }}
493 {{ self.chrome_activity_common() }}> 492 {{ self.chrome_activity_common() }}>
494 </activity> 493 </activity>
495 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" 494 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity"
496 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" 495 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity"
497 android:label="@string/webapp_activity_title" 496 android:label="@string/webapp_activity_title"
498 {{ self.supports_video_persistence() }} > 497 {{ self.supports_video_persistence() }} >
499 </activity-alias> 498 </activity-alias>
(...skipping 11 matching lines...) Expand all
511 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" 510 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}"
512 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" 511 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}"
513 android:icon="@mipmap/app_shortcut_icon" 512 android:icon="@mipmap/app_shortcut_icon"
514 android:label="@string/webapp_activity_title"> 513 android:label="@string/webapp_activity_title">
515 </activity-alias> 514 </activity-alias>
516 {% endfor %} 515 {% endfor %}
517 <!-- Activities for WebAPKs. --> 516 <!-- Activities for WebAPKs. -->
518 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" 517 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty"
519 android:theme="@style/WebappTheme" 518 android:theme="@style/WebappTheme"
520 android:label="@string/webapp_activity_title" 519 android:label="@string/webapp_activity_title"
521 android:launchMode="singleTop"
522 android:documentLaunchMode="intoExisting" 520 android:documentLaunchMode="intoExisting"
523 android:persistableMode="persistNever" 521 android:persistableMode="persistNever"
524 {{ self.supports_video_persistence() }} 522 {{ self.supports_video_persistence() }}
525 {{ self.chrome_activity_common() }}> 523 {{ self.chrome_activity_common() }}>
526 </activity> 524 </activity>
527 {% for i in range(10) %} 525 {% for i in range(10) %}
528 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" 526 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}"
529 android:theme="@style/WebappTheme" 527 android:theme="@style/WebappTheme"
530 android:icon="@mipmap/app_shortcut_icon" 528 android:icon="@mipmap/app_shortcut_icon"
531 android:label="@string/webapp_activity_title" 529 android:label="@string/webapp_activity_title"
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 999 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1002 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1000 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1003 The downstream manifest replaces this block, and hence replaces the list of media route 1001 The downstream manifest replaces this block, and hence replaces the list of media route
1004 controllers with its own list. --> 1002 controllers with its own list. -->
1005 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1003 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1006 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1004 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1007 1005
1008 {% endblock %} 1006 {% endblock %}
1009 </application> 1007 </application>
1010 </manifest> 1008 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698