| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 82035aa0b740ef856f1abb31a719777dcd39a199..e3bb3afdbcd45efa849c49bb457a28fc1903d410 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -644,6 +644,24 @@ const FeatureEntry::Choice kSSLVersionMaxChoices[] = {
|
| {IDS_FLAGS_SSL_VERSION_MAX_TLS13, switches::kSSLVersionMax, "tls1.3"},
|
| };
|
|
|
| +#if defined(OS_MACOSX)
|
| +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},
|
| +};
|
| +#endif // defined(OS_MACOSX)
|
| +
|
| // RECORDING USER METRICS FOR FLAGS:
|
| // -----------------------------------------------------------------------------
|
| // The first line of the entry is the internal name.
|
| @@ -2089,6 +2107,11 @@ const FeatureEntry kFeatureEntries[] = {
|
| "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" \
|
| "ExchangeToken")},
|
| #endif
|
| +#if defined(OS_MACOSX)
|
| + {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME,
|
| + IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsMac,
|
| + MULTI_VALUE_TYPE(kSecurityVerboseChoices)},
|
| +#endif
|
| // 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.
|
|
|