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

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

Issue 2192243002: Add enable_vr_shell build time flag and show icon in Daydream app luncher (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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 <intent-filter> 148 <intent-filter>
149 <action android:name="android.intent.action.MAIN" /> 149 <action android:name="android.intent.action.MAIN" />
150 <category android:name="android.intent.category.DEFAULT" /> 150 <category android:name="android.intent.category.DEFAULT" />
151 <category android:name="android.intent.category.LAUNCHER" /> 151 <category android:name="android.intent.category.LAUNCHER" />
152 <category android:name="android.intent.category.BROWSABLE" /> 152 <category android:name="android.intent.category.BROWSABLE" />
153 <category android:name="android.intent.category.APP_BROWSER" /> 153 <category android:name="android.intent.category.APP_BROWSER" />
154 <category android:name="android.intent.category.NOTIFICATION_PRE FERENCES" /> 154 <category android:name="android.intent.category.NOTIFICATION_PRE FERENCES" />
155 {% if channel in ['dev', 'canary', 'default'] %} 155 {% if channel in ['dev', 'canary', 'default'] %}
156 <category android:name="android.intent.category.MULTIWINDOW_LAUN CHER" /> 156 <category android:name="android.intent.category.MULTIWINDOW_LAUN CHER" />
157 {% endif %} 157 {% endif %}
158 {% if enable_vr_shell == "1" %}
159 <!-- Show icon in Daydream app launcher. -->
160 <category android:name="com.google.intent.category.DAYDREAM" />
161 {% endif %}
158 </intent-filter> 162 </intent-filter>
159 <!-- Matches the common case of intents with no MIME type. 163 <!-- Matches the common case of intents with no MIME type.
160 Make sure to keep in sync with the next filter. --> 164 Make sure to keep in sync with the next filter. -->
161 <intent-filter> 165 <intent-filter>
162 <action android:name="android.intent.action.VIEW" /> 166 <action android:name="android.intent.action.VIEW" />
163 <category android:name="android.intent.category.DEFAULT" /> 167 <category android:name="android.intent.category.DEFAULT" />
164 <category android:name="android.intent.category.BROWSABLE" /> 168 <category android:name="android.intent.category.BROWSABLE" />
165 {% if channel in ['stable', 'default'] %}<data android:scheme="g ooglechrome" />{% endif %} 169 {% if channel in ['stable', 'default'] %}<data android:scheme="g ooglechrome" />{% endif %}
166 <data android:scheme="http" /> 170 <data android:scheme="http" />
167 <data android:scheme="https" /> 171 <data android:scheme="https" />
(...skipping 686 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. 858 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. 859 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 860 The downstream manifest replaces this block, and hence replaces the list of media route
857 controllers with its own list. --> 861 controllers with its own list. -->
858 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 862 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
859 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 863 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
860 864
861 {% endblock %} 865 {% endblock %}
862 </application> 866 </application>
863 </manifest> 867 </manifest>
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/common/features.gni » ('j') | chrome/common/features.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698