| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 1c1995e59356f722f1863932f8c2b108d08a7902..3f0436b0e98b88828308be910f8be71de07755f0 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -2579,7 +2579,7 @@ const FeatureEntry kFeatureEntries[] = {
|
| flag_descriptions::kTouchscreenCalibrationName,
|
| flag_descriptions::kTouchscreenCalibrationDescription, kOsCrOS,
|
| SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchCalibrationSetting)},
|
| -#endif // defined(OS_CHROMEOS)
|
| +#endif // defined(OS_CHROMEOS)
|
|
|
| #if defined(OS_WIN)
|
| {"gdi-text-printing", flag_descriptions::kGdiTextPrinting,
|
| @@ -2594,14 +2594,14 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"show-arc-files-app", flag_descriptions::kShowArcFilesAppName,
|
| flag_descriptions::kShowArcFilesAppDescription, kOsCrOS,
|
| FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)},
|
| -#endif // defined(OS_CHROMEOS)
|
| +#endif // defined(OS_CHROMEOS)
|
|
|
| #if defined(OS_CHROMEOS)
|
| {"force-enable-stylus-tools",
|
| flag_descriptions::kForceEnableStylusToolsName,
|
| flag_descriptions::kForceEnableStylusToolsDescription, kOsCrOS,
|
| SINGLE_VALUE_TYPE(ash::switches::kAshForceEnablePalette)},
|
| -#endif // defined(OS_CHROMEOS)
|
| +#endif // defined(OS_CHROMEOS)
|
|
|
| {"enable-midi-manager-dynamic-instantiation",
|
| flag_descriptions::kEnableMidiManagerDynamicInstantiationName,
|
| @@ -2768,6 +2768,12 @@ const FeatureEntry kFeatureEntries[] = {
|
| flag_descriptions::kAutoplayPolicyDescription, kOsAll,
|
| MULTI_VALUE_TYPE(kAutoplayPolicyChoices)},
|
|
|
| +#if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS))
|
| + {"show-cert-link", flag_descriptions::kShowCertLinkOnPageInfoName,
|
| + flag_descriptions::kShowCertLinkOnPageInfoDescription, kOsDesktop,
|
| + SINGLE_VALUE_TYPE(switches::kShowCertLink)},
|
| +#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.
|
|
|