| 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 6839e68ab7b65f2181148cb40155ab52f2516fb2..78dd22685d5cd3cf05cfe7342636bfe9ec1b4d7a 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
|
| @@ -31,8 +31,6 @@ public class ContextualSearchFieldTrial {
|
| private static final int PEEK_PROMO_DEFAULT_MAX_SHOW_COUNT = 10;
|
|
|
| private static final String DISABLE_SEARCH_TERM_RESOLUTION = "disable_search_term_resolution";
|
| - private static final String DISABLE_EXTRA_SEARCH_BAR_ANIMATIONS =
|
| - "disable_extra_search_bar_animations";
|
| private static final String ENABLE_BLACKLIST = "enable_blacklist";
|
|
|
| // Translation. All these members are private, except for usage by testing.
|
| @@ -75,6 +73,9 @@ 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";
|
|
|
| + // UI integration with Now on Tap data.
|
| + private static final String NOW_ON_TAP_BAR_INTEGRATION = "now_on_tap_bar_integration";
|
| +
|
| // Cached values to avoid repeated and redundant JNI operations.
|
| private static Boolean sEnabled;
|
| private static Boolean sDisableSearchTermResolution;
|
| @@ -96,6 +97,7 @@ public class ContextualSearchFieldTrial {
|
| private static Boolean sIsBarOverlapCollectionEnabled;
|
| private static Boolean sIsBarOverlapSuppressionEnabled;
|
| private static Integer sSuppressionTaps;
|
| + private static Boolean sIsNowOnTapBarIntegrationEnabled;
|
|
|
| /**
|
| * Don't instantiate.
|
| @@ -192,13 +194,6 @@ public class ContextualSearchFieldTrial {
|
| }
|
|
|
| /**
|
| - * @return Whether extra search bar animations are disabled.
|
| - */
|
| - static boolean areExtraSearchBarAnimationsDisabled() {
|
| - return getBooleanParam(DISABLE_EXTRA_SEARCH_BAR_ANIMATIONS);
|
| - }
|
| -
|
| - /**
|
| * @return Whether the blacklist is enabled.
|
| */
|
| static boolean isBlacklistEnabled() {
|
| @@ -374,6 +369,13 @@ public class ContextualSearchFieldTrial {
|
| return sSuppressionTaps.intValue();
|
| }
|
|
|
| + static boolean isNowOnTapBarIntegrationEnabled() {
|
| + if (sIsNowOnTapBarIntegrationEnabled == null) {
|
| + sIsNowOnTapBarIntegrationEnabled = getBooleanParam(NOW_ON_TAP_BAR_INTEGRATION);
|
| + }
|
| + return sIsNowOnTapBarIntegrationEnabled;
|
| + }
|
| +
|
| // --------------------------------------------------------------------------------------------
|
| // Helpers.
|
| // --------------------------------------------------------------------------------------------
|
|
|