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

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

Issue 1526323003: Add Physical Web opt-in dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: taking changes from dfalcantara@ Created 4 years, 12 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/res/layout/physical_web_optin.xml » ('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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 </activity> 399 </activity>
400 400
401 <!-- Activity to list Physical Web Urls --> 401 <!-- Activity to list Physical Web Urls -->
402 <activity android:name="org.chromium.chrome.browser.physicalweb.ListUrls Activity" 402 <activity android:name="org.chromium.chrome.browser.physicalweb.ListUrls Activity"
403 android:label="@string/physical_web_list_urls_activity_title" 403 android:label="@string/physical_web_list_urls_activity_title"
404 android:theme="@style/PhysicalWebNearbyUrlsListStyle" 404 android:theme="@style/PhysicalWebNearbyUrlsListStyle"
405 android:autoRemoveFromRecents="true" 405 android:autoRemoveFromRecents="true"
406 android:exported="false"> 406 android:exported="false">
407 </activity> 407 </activity>
408 408
409 <!-- Opt-in activity for Physical Web -->
410 <activity android:name="org.chromium.chrome.browser.physicalweb.Physical WebOptInActivity"
411 android:label="@string/physical_web_list_urls_activity_title"
412 android:theme="@style/PhysicalWebOptInStyle"
413 android:autoRemoveFromRecents="true"
414 android:exported="false">
415 </activity>
416
409 <!-- Providers for chrome data. --> 417 <!-- Providers for chrome data. -->
410 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r" 418 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r"
411 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}" 419 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}"
412 android:exported="true"> 420 android:exported="true">
413 <path-permission android:path="/bookmarks/search_suggest_query" 421 <path-permission android:path="/bookmarks/search_suggest_query"
414 android:readPermission="android.permission.GLOBAL_SEARCH" /> 422 android:readPermission="android.permission.GLOBAL_SEARCH" />
415 </provider> 423 </provider>
416 424
417 <!-- Provider for FileProvider. --> 425 <!-- Provider for FileProvider. -->
418 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider" 426 <provider android:name="org.chromium.chrome.browser.util.CompatibilityFi leProvider"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 692 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
685 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 693 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
686 The downstream manifest replaces this block, and hence replaces the list of media route 694 The downstream manifest replaces this block, and hence replaces the list of media route
687 controllers with its own list. --> 695 controllers with its own list. -->
688 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 696 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
689 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 697 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
690 698
691 {% endblock %} 699 {% endblock %}
692 </application> 700 </application>
693 </manifest> 701 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/layout/physical_web_optin.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698