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

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)
Patch Set: Fix lint warnings generated by vr_shell's new pickier checks. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 0d00a21293efbd82e37018bbe98b6261eb209152..b307954e647046b315308838150ce0c794520480 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -52,9 +52,8 @@ by a child template that "extends" this file.
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
- {% set enable_vr_shell = enable_vr_shell|default(0) %}
{% set enable_webvr = enable_webvr|default(0) %}
- {% if enable_vr_shell == "true" or enable_webvr == "true" %}
+ {% if enable_webvr == "true" %}
<!-- Required to read the paired viewer's distortion parameters. -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<!-- Indicates use of Android's VR-mode, available only on Android N+. -->
@@ -376,7 +375,7 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
- {% if enable_vr_shell == "true" or enable_webvr == "true" %}
+ {% if enable_webvr == "true" %}
<!--
TODO(mthiesse): Temporarily skip ChromeLauncherActivity when returning from Daydream
DON flow to avoid polluting metrics.
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698