| Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
|
| index fb275027b767c9fbc962a9e4c6b95ae67df47f9c..c12da1279f35be452a5afce788855beb3c6184e1 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/TapSuppressionHeuristics.java
|
| @@ -19,22 +19,19 @@ public class TapSuppressionHeuristics extends ContextualSearchHeuristics {
|
| * @param tapsSinceOpen the number of Tap gestures since the last open of the panel.
|
| */
|
| TapSuppressionHeuristics(ContextualSearchSelectionController selectionController,
|
| - ContextualSearchTapState previousTapState, int x, int y, int tapsSinceOpen) {
|
| + ContextualSearchTapState previousTapState, int x, int y, int tapsSinceOpen,
|
| + ContextualSearchContext contextualSearchContext) {
|
| super();
|
| mCtrSuppression = new CtrSuppression();
|
| mHeuristics.add(mCtrSuppression);
|
| - RecentScrollTapSuppression scrollTapExperiment =
|
| - new RecentScrollTapSuppression(selectionController);
|
| - mHeuristics.add(scrollTapExperiment);
|
| + mHeuristics.add(new RecentScrollTapSuppression(selectionController));
|
| TapFarFromPreviousSuppression farFromPreviousHeuristic =
|
| new TapFarFromPreviousSuppression(selectionController, previousTapState, x, y);
|
| mHeuristics.add(farFromPreviousHeuristic);
|
| - NearTopTapSuppression tapNearTopSuppression =
|
| - new NearTopTapSuppression(selectionController, y);
|
| - mHeuristics.add(tapNearTopSuppression);
|
| - BarOverlapTapSuppression barOverlapTapSuppression =
|
| - new BarOverlapTapSuppression(selectionController, y);
|
| - mHeuristics.add(barOverlapTapSuppression);
|
| + mHeuristics.add(new TapWordLengthSuppression(contextualSearchContext));
|
| + mHeuristics.add(new TapWordEdgeSuppression(contextualSearchContext));
|
| + mHeuristics.add(new NearTopTapSuppression(selectionController, y));
|
| + mHeuristics.add(new BarOverlapTapSuppression(selectionController, y));
|
| // General Tap Suppression and Tap Twice.
|
| TapSuppression tapSuppression =
|
| new TapSuppression(selectionController, previousTapState, x, y, tapsSinceOpen);
|
|
|