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

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

Issue 2176373007: Use Nearby to background scan for URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 android:theme="@style/PhysicalWebOptInStyle" 523 android:theme="@style/PhysicalWebOptInStyle"
524 android:exported="false"> 524 android:exported="false">
525 </activity> 525 </activity>
526 526
527 <!-- Broadcast receiver that will clean up Physical web notifications at scheduled 527 <!-- Broadcast receiver that will clean up Physical web notifications at scheduled
528 intervals --> 528 intervals -->
529 <receiver android:name="org.chromium.chrome.browser.physicalweb.ClearNot ificationAlarmReceiver" 529 <receiver android:name="org.chromium.chrome.browser.physicalweb.ClearNot ificationAlarmReceiver"
530 android:exported="false"> 530 android:exported="false">
531 </receiver> 531 </receiver>
532 532
533 <!-- Service for handling Nearby Messages -->
534 <service android:name="org.chromium.chrome.browser.physicalweb.NearbyMes sageIntentService"
535 android:exported="false"
gone 2016/07/27 17:38:47 Put /> right after the android:exported bit. See
cco3 2016/07/27 18:54:59 Done.
536 />
537
533 <!-- Providers for chrome data. --> 538 <!-- Providers for chrome data. -->
534 <provider android:name="org.chromium.chrome.browser.provider.ChromeBrows erProvider" 539 <provider android:name="org.chromium.chrome.browser.provider.ChromeBrows erProvider"
535 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}" 540 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}"
536 android:exported="true"> 541 android:exported="true">
537 <path-permission android:path="/bookmarks/search_suggest_query" 542 <path-permission android:path="/bookmarks/search_suggest_query"
538 android:readPermission="android.permission.GLOBAL_SEARCH" /> 543 android:readPermission="android.permission.GLOBAL_SEARCH" />
539 </provider> 544 </provider>
540 545
541 <!-- Provider for FileProvider. --> 546 <!-- Provider for FileProvider. -->
542 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 547 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 859 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
855 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 860 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
856 The downstream manifest replaces this block, and hence replaces the list of media route 861 The downstream manifest replaces this block, and hence replaces the list of media route
857 controllers with its own list. --> 862 controllers with its own list. -->
858 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 863 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
859 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 864 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
860 865
861 {% endblock %} 866 {% endblock %}
862 </application> 867 </application>
863 </manifest> 868 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698