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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

Issue 2888203003: Add separate feature flag for VR CCT browsing. (Closed)
Patch Set: Add histogram enums + add matching buildflags for descriptions. Created 3 years, 7 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
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
index 3620c6d304a6116cccf9d4c1e432516314b314f4..b554bea61c862e95304a1ef03bba297d0db9cab0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
@@ -318,7 +318,11 @@ public class VrShellDelegate implements ApplicationStatus.ActivityStateListener,
}
private static boolean activitySupportsVrBrowsing(Activity activity) {
- return activity instanceof ChromeTabbedActivity || activity instanceof CustomTabActivity;
+ if (activity instanceof ChromeTabbedActivity) return true;
+ if (activity instanceof CustomTabActivity) {
+ return ChromeFeatureList.isEnabled(ChromeFeatureList.VR_CUSTOM_TAB_BROWSING);
+ }
+ return false;
}
/**
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698