| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 5416f60827fa77793f05e807d626d045841e9f84..7aa201a8f7ac816c097b7be938a4581ea19ad265 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -644,20 +644,23 @@ const FeatureEntry::Choice kSSLVersionMaxChoices[] = {
|
| {IDS_FLAGS_SSL_VERSION_MAX_TLS13, switches::kSSLVersionMax, "tls1.3"},
|
| };
|
|
|
| -const FeatureEntry::Choice kSecurityVerboseChoices[] = {
|
| - {IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DEFAULT, "", ""},
|
| - {IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_SHOW_ALL_ANIMATED,
|
| - switches::kMaterialSecurityVerbose,
|
| - switches::kMaterialSecurityVerboseShowAllAnimated},
|
| - {IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_SHOW_ALL_NONANIMATED,
|
| - switches::kMaterialSecurityVerbose,
|
| - switches::kMaterialSecurityVerboseShowAllNonAnimated},
|
| - {IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_SHOW_NONSECURE_ANIMATED,
|
| - switches::kMaterialSecurityVerbose,
|
| - switches::kMaterialSecurityVerboseShowNonSecureAnimated},
|
| - {IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_SHOW_NONSECURE_NONANIMATED,
|
| - switches::kMaterialSecurityVerbose,
|
| - switches::kMaterialSecurityVerboseShowNonSecureNonAnimated},
|
| +const FeatureEntry::Choice kSecurityVerboseDecorationChoices[] = {
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_DEFAULT, "", ""},
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_SHOW_ALL_ANIMATED,
|
| + switches::kSecurityVerboseDecoration,
|
| + switches::kSecurityVerboseDecorationShowAllAnimated},
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_SHOW_ALL_NONANIMATED,
|
| + switches::kSecurityVerboseDecoration,
|
| + switches::kSecurityVerboseDecorationShowAllNonAnimated},
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_SHOW_ALL_WITH_ONLY_NONSECURE_ANIMATED,
|
| + switches::kSecurityVerboseDecoration,
|
| + switches::kSecurityVerboseDecorationShowAllWithOnlyNonSecureAnimated},
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_SHOW_NONSECURE_ANIMATED,
|
| + switches::kSecurityVerboseDecoration,
|
| + switches::kSecurityVerboseDecorationShowNonSecureAnimated},
|
| + {IDS_FLAGS_SECURITY_VERBOSE_DECORATION_SHOW_NONSECURE_NONANIMATED,
|
| + switches::kSecurityVerboseDecoration,
|
| + switches::kSecurityVerboseDecorationShowNonSecureNonAnimated},
|
| };
|
|
|
| // RECORDING USER METRICS FOR FLAGS:
|
| @@ -2103,9 +2106,9 @@ const FeatureEntry kFeatureEntries[] = {
|
| "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/"
|
| "ExchangeToken")},
|
| #endif // OS_CHROMEOS
|
| - {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME,
|
| - IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop,
|
| - MULTI_VALUE_TYPE(kSecurityVerboseChoices)},
|
| + {"security-verbose-decoration", IDS_FLAGS_SECURITY_VERBOSE_DECORATION_NAME,
|
| + IDS_FLAGS_SECURITY_VERBOSE_DECORATION_DESCRIPTION, kOsDesktop,
|
| + MULTI_VALUE_TYPE(kSecurityVerboseDecorationChoices)},
|
| // NOTE: Adding new command-line switches requires adding corresponding
|
| // entries to enum "LoginCustomFlags" in histograms.xml. See note in
|
| // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
|
|
|