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

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: Sync changes. Created 3 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 android:theme="@style/FullscreenTransparentActivityTheme" 679 android:theme="@style/FullscreenTransparentActivityTheme"
680 android:exported="true" 680 android:exported="true"
681 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 681 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
682 <intent-filter> 682 <intent-filter>
683 <action android:name="android.support.customtabs.browseractions. browser_action_open" /> 683 <action android:name="android.support.customtabs.browseractions. browser_action_open" />
684 <category android:name="android.intent.category.DEFAULT" /> 684 <category android:name="android.intent.category.DEFAULT" />
685 <data android:scheme="http" /> 685 <data android:scheme="http" />
686 <data android:scheme="https" /> 686 <data android:scheme="https" />
687 </intent-filter> 687 </intent-filter>
688 </activity> 688 </activity>
689
690 <service android:name="org.chromium.chrome.browser.browseractions.Browse rActionsService"
691 android:exported="false">
692 </service>
689 {% endif %} 693 {% endif %}
690 694
691 <!-- Service for Broadcasting a Physical Web URL --> 695 <!-- Service for Broadcasting a Physical Web URL -->
692 <service 696 <service
693 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService" 697 android:name="org.chromium.chrome.browser.physicalweb.PhysicalWebBro adcastService"
694 android:exported="false"> 698 android:exported="false">
695 </service> 699 </service>
696 700
697 <!-- Service for decoding images in a sandboxed process. --> 701 <!-- Service for decoding images in a sandboxed process. -->
698 <service 702 <service
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 1066 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
1063 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 1067 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
1064 The downstream manifest replaces this block, and hence replaces the list of media route 1068 The downstream manifest replaces this block, and hence replaces the list of media route
1065 controllers with its own list. --> 1069 controllers with its own list. -->
1066 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 1070 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
1067 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 1071 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
1068 1072
1069 {% endblock %} 1073 {% endblock %}
1070 </application> 1074 </application>
1071 </manifest> 1075 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698