Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 7b6ea0f4ebe9259d92943574a4b6f413799abb27..53c1d436a0923da85888d0e84b3a0c0f3831c458 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -2357,7 +2357,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) |
lgarron
2017/04/05 02:06:25
Nit: don't change indentation of unrelated code (m
elawrence
2017/04/06 01:06:10
This is from git cl lint. I wasn't able to quickly
|
#if defined(OS_WIN) |
{"gdi-text-printing", flag_descriptions::kGdiTextPrinting, |
@@ -2372,7 +2372,7 @@ 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_ANDROID) |
{"aia-fetching", flag_descriptions::kAiaFetchingName, |
@@ -2385,7 +2385,7 @@ const FeatureEntry kFeatureEntries[] = { |
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, |
@@ -2489,6 +2489,12 @@ const FeatureEntry kFeatureEntries[] = { |
FEATURE_VALUE_TYPE(chrome::android::kCustomContextMenu)}, |
#endif // OS_ANDROID |
+#if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS)) |
+ {"show-cert-button", flag_descriptions::kShowCertButtonOnPageInfoName, |
lgarron
2017/04/05 02:06:25
Nit: If it's going to be a link in the foreseeable
elawrence
2017/04/06 01:06:10
I suppose it's a link today and likely to remain t
|
+ flag_descriptions::kShowCertButtonOnPageInfoDescription, kOsDesktop, |
+ SINGLE_VALUE_TYPE(switches::kShowCertButton)}, |
+#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. |