| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 3e5e15d6d9fd7cd659e1feb2f354b90148e12538..922da97750609c1040b1e4a65e037b0455485f36 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -538,6 +538,22 @@ const FeatureEntry::Choice kAshForceTabletModeChoices[] = {
|
| };
|
| #endif // OS_CHROMEOS
|
|
|
| +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
|
| + defined(OS_WIN)
|
| +const FeatureEntry::Choice kGlobalErrorMenuIconChoices[] = {
|
| + {flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
| + {flag_descriptions::kGlobalErrorMenuIconOldBehavior,
|
| + switches::kGlobalErrorMenuIcon, switches::kGlobalErrorMenuIconOldBehavior},
|
| + {flag_descriptions::kGlobalErrorMenuIconPersistentOpenedState,
|
| + switches::kGlobalErrorMenuIcon,
|
| + switches::kGlobalErrorMenuIconPersistentOpenedState},
|
| + {flag_descriptions::kGlobalErrorMenuIconPersistentClosedState,
|
| + switches::kGlobalErrorMenuIcon,
|
| + switches::kGlobalErrorMenuIconPersistentClosedState},
|
| +};
|
| +#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
|
| + // defined(OS_WIN)
|
| +
|
| #if defined(OS_ANDROID)
|
| const FeatureEntry::FeatureParam
|
| kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
|
| @@ -2522,6 +2538,9 @@ const FeatureEntry kFeatureEntries[] = {
|
| flag_descriptions::kOmniboxEntitySuggestionsName,
|
| flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
|
| FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
|
| + {"global-error-menu-icon", flag_descriptions::kGlobalErrorMenuIconName,
|
| + flag_descriptions::kGlobalErrorMenuIconDescription, kOsDesktop,
|
| + MULTI_VALUE_TYPE(kGlobalErrorMenuIconChoices)},
|
| #endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
|
| // defined(OS_WIN)
|
|
|
|
|