Expose OmniboxUIExperimentMaxAutocompleteMatches flag on iOS.
Exposes the OmniboxUIExperimentMaxAutocompleteMatches flag on iOS flags
page. Unfortunately, there seems to be no good way to share flags with
iOS at the moment, so this involves a lot of copy-paste.
Also extend maximum numbers of rows in UI implementation to 12 to
prevent crashes when this flag is used.
Bug: 908478
Change-Id: I5347400289cd10ac2ae735e9ed6cb930c6a0d405
Reviewed-on: https://chromium-review.googlesource.com/c/1425722
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Auto-Submit: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625180}diff --git a/ios/chrome/browser/about_flags.mm b/ios/chrome/browser/about_flags.mm
index 54b20702..1568dab 100644
--- a/ios/chrome/browser/about_flags.mm
+++ b/ios/chrome/browser/about_flags.mm
@@ -122,6 +122,38 @@
{"1000", autofill::switches::kAutofillIOSDelayBetweenFields, "1000"},
};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches3[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "3"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches4[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "4"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches5[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "5"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches6[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "6"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches8[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "8"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches10[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "10"}};
+const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches12[] = {
+ {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "12"}};
+
+const FeatureEntry::FeatureVariation
+ kOmniboxUIMaxAutocompleteMatchesVariations[] = {
+ {"3 matches", kOmniboxUIMaxAutocompleteMatches3,
+ base::size(kOmniboxUIMaxAutocompleteMatches3), nullptr},
+ {"4 matches", kOmniboxUIMaxAutocompleteMatches4,
+ base::size(kOmniboxUIMaxAutocompleteMatches4), nullptr},
+ {"5 matches", kOmniboxUIMaxAutocompleteMatches5,
+ base::size(kOmniboxUIMaxAutocompleteMatches5), nullptr},
+ {"6 matches", kOmniboxUIMaxAutocompleteMatches6,
+ base::size(kOmniboxUIMaxAutocompleteMatches6), nullptr},
+ {"8 matches", kOmniboxUIMaxAutocompleteMatches8,
+ base::size(kOmniboxUIMaxAutocompleteMatches8), nullptr},
+ {"10 matches", kOmniboxUIMaxAutocompleteMatches10,
+ base::size(kOmniboxUIMaxAutocompleteMatches10), nullptr},
+ {"12 matches", kOmniboxUIMaxAutocompleteMatches12,
+ base::size(kOmniboxUIMaxAutocompleteMatches12), nullptr}};
+
const FeatureEntry::FeatureParam kIconForSearchButtonGrey[] = {
{kIconForSearchButtonFeatureParameterName,
kIconForSearchButtonParameterGrey}};
@@ -406,6 +438,14 @@
flag_descriptions::kOmniboxTabSwitchSuggestionsDescription,
flags_ui::kOsIos,
FEATURE_VALUE_TYPE(omnibox::kOmniboxTabSwitchSuggestions)},
+ {"omnibox-ui-max-autocomplete-matches",
+ flag_descriptions::kOmniboxUIMaxAutocompleteMatchesName,
+ flag_descriptions::kOmniboxUIMaxAutocompleteMatchesDescription,
+ flags_ui::kOsIos,
+ FEATURE_WITH_PARAMS_VALUE_TYPE(
+ omnibox::kUIExperimentMaxAutocompleteMatches,
+ kOmniboxUIMaxAutocompleteMatchesVariations,
+ "OmniboxUIMaxAutocompleteVariations")},
{"fcm-invalidations", flag_descriptions::kFCMInvalidationsName,
flag_descriptions::kFCMInvalidationsDescription, flags_ui::kOsIos,
FEATURE_VALUE_TYPE(invalidation::switches::kFCMInvalidations)},
diff --git a/ios/chrome/browser/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/ios_chrome_flag_descriptions.cc
index 99b5694..94db182 100644
--- a/ios/chrome/browser/ios_chrome_flag_descriptions.cc
+++ b/ios/chrome/browser/ios_chrome_flag_descriptions.cc
@@ -332,6 +332,12 @@
const char kOmniboxTabSwitchSuggestionsDescription[] =
"Enable the 'switch to this tab' options in the omnibox suggestions.";
+const char kOmniboxUIMaxAutocompleteMatchesName[] =
+ "Omnibox UI Max Autocomplete Matches";
+const char kOmniboxUIMaxAutocompleteMatchesDescription[] =
+ "Changes the maximum number of autocomplete matches displayed in the "
+ "Omnibox UI.";
+
const char kOmniboxUIElideSuggestionUrlAfterHostName[] =
"Hide the path, query, and ref of omnibox suggestions";
const char kOmniboxUIElideSuggestionUrlAfterHostDescription[] =
diff --git a/ios/chrome/browser/ios_chrome_flag_descriptions.h b/ios/chrome/browser/ios_chrome_flag_descriptions.h
index 1e40c032..61012e6 100644
--- a/ios/chrome/browser/ios_chrome_flag_descriptions.h
+++ b/ios/chrome/browser/ios_chrome_flag_descriptions.h
@@ -264,6 +264,11 @@
extern const char kOmniboxTabSwitchSuggestionsName[];
extern const char kOmniboxTabSwitchSuggestionsDescription[];
+// Title and description for the flag to change the max number of autocomplete
+// matches in the omnibox popup.
+extern const char kOmniboxUIMaxAutocompleteMatchesName[];
+extern const char kOmniboxUIMaxAutocompleteMatchesDescription[];
+
// Title and description for the flag to enable elision of the URL path, query,
// and ref in omnibox URL suggestions.
extern const char kOmniboxUIElideSuggestionUrlAfterHostName[];
diff --git a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm
index 39d9764..f88002e 100644
--- a/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm
+++ b/ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.mm
@@ -29,7 +29,7 @@
#endif
namespace {
-const int kRowCount = 6;
+const int kRowCount = 12;
const CGFloat kRowHeight = 48.0;
const CGFloat kShortcutsRowHeight = 220;
const CGFloat kAnswerRowHeight = 64.0;
