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

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

Issue 2984453002: Add Browser Actions tab model selector and open a tab through it if ChromeTabbedActivity is not ava…
Patch Set: Created 3 years, 5 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 624 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
625 <intent-filter> 625 <intent-filter>
626 <action android:name="android.support.customtabs.browseractions. browser_action_open" /> 626 <action android:name="android.support.customtabs.browseractions. browser_action_open" />
627 <category android:name="android.intent.category.DEFAULT" /> 627 <category android:name="android.intent.category.DEFAULT" />
628 <data android:scheme="http" /> 628 <data android:scheme="http" />
629 <data android:scheme="https" /> 629 <data android:scheme="https" />
630 </intent-filter> 630 </intent-filter>
631 </activity> 631 </activity>
632 {% endif %} 632 {% endif %}
633 633
634 <service android:name="org.chromium.chrome.browser.browseractions.Browse rActionsTabCreationService"
635 android:exported="false">
636 </service>
637
634 <!-- Service for Broadcasting a Physical Web URL --> 638 <!-- Service for Broadcasting a Physical Web URL -->
635 <service 639 <service
636 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService" 640 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService"
637 android:exported="false"> 641 android:exported="false">
638 </service> 642 </service>
639 643
640 <!-- Service for decoding images in a sandboxed process. --> 644 <!-- Service for decoding images in a sandboxed process. -->
641 <service 645 <service
642 android:description="@string/decoder_description" 646 android:description="@string/decoder_description"
643 android:name="org.chromium.chrome.browser.photo_picker.DecoderServic e" 647 android:name="org.chromium.chrome.browser.photo_picker.DecoderServic e"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 1009 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1006 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1010 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1007 The downstream manifest replaces this block, and hence replaces the list of media route 1011 The downstream manifest replaces this block, and hence replaces the list of media route
1008 controllers with its own list. --> 1012 controllers with its own list. -->
1009 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1013 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1010 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1014 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1011 1015
1012 {% endblock %} 1016 {% endblock %}
1013 </application> 1017 </application>
1014 </manifest> 1018 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698