Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index aa20d19c26515fc3eea870732d608bffee6ca69e..d2758f302300199ad531956fbc9a9ddcc476bbea 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -539,6 +539,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[] = { |
msw
2017/04/13 17:23:12
nit: It's a bit odd to use the GlobalError name th
spqchan
2017/04/13 22:52:42
Done.
|
+ {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[] = { |
@@ -2558,6 +2574,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) |