| Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java
|
| index b39e1b0421e16b210fb685dc77ea874cd626ce55..2338ff71cb7eaa6d38bb3732d02d8fbcca93642c 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFieldTrial.java
|
| @@ -73,6 +73,13 @@ public class ContextualSearchFieldTrial {
|
| private static final String ENABLE_BAR_OVERLAP_COLLECTION = "enable_bar_overlap_collection";
|
| private static final String BAR_OVERLAP_SUPPRESSION_ENABLED = "enable_bar_overlap_suppression";
|
|
|
| + // Safety switch for disabling online-detection. Also used to disable detection when running
|
| + // tests.
|
| + @VisibleForTesting
|
| + static final String ONLINE_DETECTION_DISABLED = "disable_online_detection";
|
| +
|
| + private static final String ENABLE_AMP_AS_SEPARATE_TAB = "enable_amp_as_separate_tab";
|
| +
|
| // Cached values to avoid repeated and redundant JNI operations.
|
| private static Boolean sEnabled;
|
| private static Boolean sDisableSearchTermResolution;
|
| @@ -95,6 +102,8 @@ public class ContextualSearchFieldTrial {
|
| private static Boolean sIsBarOverlapSuppressionEnabled;
|
| private static Integer sSuppressionTaps;
|
| private static Boolean sIsContextualCardsBarIntegrationEnabled;
|
| + private static Boolean sIsOnlineDetectionDisabled;
|
| + private static Boolean sIsAmpAsSeparateTabEnabled;
|
|
|
| /**
|
| * Don't instantiate.
|
| @@ -366,6 +375,16 @@ public class ContextualSearchFieldTrial {
|
| return sSuppressionTaps.intValue();
|
| }
|
|
|
| + /**
|
| + * @return Whether to auto-promote clicks in the AMP carousel into a separate Tab.
|
| + */
|
| + static boolean isAmpAsSeparateTabEnabled() {
|
| + if (sIsAmpAsSeparateTabEnabled == null) {
|
| + sIsAmpAsSeparateTabEnabled = getBooleanParam(ENABLE_AMP_AS_SEPARATE_TAB);
|
| + }
|
| + return sIsAmpAsSeparateTabEnabled;
|
| + }
|
| +
|
| // TODO(donnd): Remove once bar-integration is fully landed if still unused (native only).
|
| static boolean isContextualCardsBarIntegrationEnabled() {
|
| if (sIsContextualCardsBarIntegrationEnabled == null) {
|
|
|