From 5ee6fc0a9289c0f5c765f743a416859a544a19b6 Mon Sep 17 00:00:00 2001 From: Tomasz Wiszkowski Date: Fri, 2 Jun 2023 19:15:02 +0000 Subject: [PATCH] [M115 branch 5790 merge] Further restrict promoted ActionsInSuggest to top position. (cherry picked from commit 5f98aec321742e72e1a1370827b4d34f9a437a68) Bug: 1450696 Change-Id: Ib12c5cfdbb79f3b0b4ff3ddc6ad897da98622e4a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4581730 Commit-Queue: Tomasz Wiszkowski Reviewed-by: Moe Ahmadi Auto-Submit: Tomasz Wiszkowski Cr-Original-Commit-Position: refs/heads/main@{#1152142} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4584413 Reviewed-by: Krishna Govind Reviewed-by: Tomasz Wiszkowski Owners-Override: Krishna Govind Bot-Commit: Rubber Stamper Commit-Queue: Krishna Govind Cr-Commit-Position: refs/branch-heads/5790@{#277} Cr-Branched-From: 1d71a337b1f6e707a13ae074dca1e2c34905eb9f-refs/heads/main@{#1148114} --- components/omnibox/browser/autocomplete_result.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc index 1fd89221ce7b67..26dfa224d31b2b 100644 --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc @@ -542,7 +542,9 @@ void AutocompleteResult::TrimOmniboxActions(bool is_zero_suggest) { // - In every case, HISTORY_CLUSTERS is preferred over PEDALs. // - TAB_SWITCH actions are not considered because they're never attached. if constexpr (is_android) { - static constexpr size_t ACTIONS_IN_SUGGEST_CUTOFF_THRESHOLD = 2; + const size_t ACTIONS_IN_SUGGEST_CUTOFF_THRESHOLD = + OmniboxFieldTrial::kActionsInSuggestPromoteEntitySuggestion.Get() ? 1 + : 2; static constexpr size_t PEDALS_CUTOFF_THRESHOLD = 3; std::vector include_all{OmniboxActionId::ACTION_IN_SUGGEST, OmniboxActionId::HISTORY_CLUSTERS,