| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 8559ba21531e92b7a2f2a2ec65c164480153549c..8326bb773bafe2c75d2edb2ae2c00e164f9791f2 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -667,6 +667,28 @@ const FeatureEntry::Choice kHerbPrototypeChoices[] = {
|
| };
|
| #endif // OS_ANDROID
|
|
|
| +#if defined(OS_ANDROID)
|
| +const FeatureEntry::Choice kOmniboxPlaceholderExperimentChoices[] = {
|
| + {flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeUrl,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeUrl"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeWebsiteName,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeWebsiteName"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchTheWeb,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchTheWeb"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentEnterASearchOrWebsite,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "EnterASearchOrWebsite"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchNews,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchNews"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchRecipes,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchRecipes"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentSearchWeather,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "SearchWeather"},
|
| + {flag_descriptions::kOmniboxPlaceholderExperimentBlank,
|
| + switches::kOmniboxPlaceholderExperimentSwitch, "Blank"},
|
| +};
|
| +#endif // OS_ANDROID
|
| +
|
| const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = {
|
| {flag_descriptions::kEnableUseZoomForDsfChoiceDefault, "", ""},
|
| {flag_descriptions::kEnableUseZoomForDsfChoiceEnabled,
|
| @@ -2154,6 +2176,12 @@ const FeatureEntry kFeatureEntries[] = {
|
| flag_descriptions::kHerbPrototypeChoicesDescription, kOsAndroid,
|
| MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
|
| #endif // OS_ANDROID
|
| +#if defined(OS_ANDROID)
|
| + {"omnibox-placeholder-experiment",
|
| + flag_descriptions::kOmniboxPlaceholderExperimentName,
|
| + flag_descriptions::kOmniboxPlaceholderExperimentDescription, kOsAndroid,
|
| + MULTI_VALUE_TYPE(kOmniboxPlaceholderExperimentChoices)},
|
| +#endif // OS_ANDROID
|
| {"enable-md-bookmarks",
|
| flag_descriptions::kEnableMaterialDesignBookmarksName,
|
| flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop,
|
|
|