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

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

Issue 2755003003: Add Interstitial for user consent (Closed)
Patch Set: Created 3 years, 9 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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 android:noHistory="true" 646 android:noHistory="true"
647 android:theme="@android:style/Theme.NoDisplay" 647 android:theme="@android:style/Theme.NoDisplay"
648 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" > 648 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" >
649 <intent-filter> 649 <intent-filter>
650 <action android:name="android.intent.action.SEND" /> 650 <action android:name="android.intent.action.SEND" />
651 <category android:name="android.intent.category.DEFAULT" /> 651 <category android:name="android.intent.category.DEFAULT" />
652 <data android:mimeType="text/plain" /> 652 <data android:mimeType="text/plain" />
653 </intent-filter> 653 </intent-filter>
654 </activity> 654 </activity>
655 655
656 <!-- This activity is to expose the PhysicalWeb Share option via the gen eric Android share action. -->
657 <activity
658 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebSha reEntryActivity"
659 android:label="@string/physical_web_share_entry_title"
660 android:enabled="true"
cco3 2017/03/16 22:54:32 This line isn't needed.
iankc 2017/03/17 00:08:44 Done.
661 android:excludeFromRecents="true"
662 android:noHistory="true"
663 android:theme="@style/AlertDialogTheme"
664 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" >
665 </activity>
666
656 <!-- Service for Broadcasting a Physical Web URL --> 667 <!-- Service for Broadcasting a Physical Web URL -->
657 <service 668 <service
658 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService" 669 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService"
659 android:exported="false"> 670 android:exported="false">
660 </service> 671 </service>
661 672
662 <!-- Providers for chrome data. --> 673 <!-- Providers for chrome data. -->
663 <provider android:name="org.chromium.chrome.browser.provider.ChromeBrows erProvider" 674 <provider android:name="org.chromium.chrome.browser.provider.ChromeBrows erProvider"
664 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}" 675 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}"
665 android:exported="true"> 676 android:exported="true">
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 973 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
963 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 974 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
964 The downstream manifest replaces this block, and hence replaces the list of media route 975 The downstream manifest replaces this block, and hence replaces the list of media route
965 controllers with its own list. --> 976 controllers with its own list. -->
966 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 977 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
967 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 978 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
968 979
969 {% endblock %} 980 {% endblock %}
970 </application> 981 </application>
971 </manifest> 982 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698