Clean up flag_descriptions.cc
- Consolidate entries into the appropriate sections.
- Sort a few obviously out of order entries.
- Do not use "extern" in the .cc file.
Change-Id: I2dc0c0f58be5507de5674565e09ac55e2b3df4c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2197671
Reviewed-by: Elly Fong-Jones <[email protected]>
Commit-Queue: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#769414}
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index e5123f5..5cf61a1a 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -917,6 +917,9 @@
extern const char kOverscrollHistoryNavigationName[];
extern const char kOverscrollHistoryNavigationDescription[];
+extern const char kPaintHoldingName[];
+extern const char kPaintHoldingDescription[];
+
extern const char kParallelDownloadingName[];
extern const char kParallelDownloadingDescription[];
@@ -1198,14 +1201,14 @@
extern const char kTouchEventsName[];
extern const char kTouchEventsDescription[];
-extern const char kTouchpadOverscrollHistoryNavigationName[];
-extern const char kTouchpadOverscrollHistoryNavigationDescription[];
-
extern const char kTouchSelectionStrategyName[];
extern const char kTouchSelectionStrategyDescription[];
extern const char kTouchSelectionStrategyCharacter[];
extern const char kTouchSelectionStrategyDirection[];
+extern const char kTouchpadOverscrollHistoryNavigationName[];
+extern const char kTouchpadOverscrollHistoryNavigationDescription[];
+
extern const char kTraceUploadUrlName[];
extern const char kTraceUploadUrlDescription[];
extern const char kTraceUploadUrlChoiceOther[];
@@ -1302,14 +1305,6 @@
extern const char kWebrtcUseMinMaxVEADimensionsName[];
extern const char kWebrtcUseMinMaxVEADimensionsDescription[];
-#if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
-extern const char kWebUITabStripName[];
-extern const char kWebUITabStripDescription[];
-
-extern const char kWebUITabStripDemoOptionsName[];
-extern const char kWebUITabStripDemoOptionsDescription[];
-#endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
-
extern const char kWebXrForceRuntimeName[];
extern const char kWebXrForceRuntimeDescription[];
@@ -1749,8 +1744,8 @@
extern const char kEnableMediaFoundationVideoCaptureName[];
extern const char kEnableMediaFoundationVideoCaptureDescription[];
-extern const char kGdiTextPrinting[];
-extern const char kGdiTextPrintingDescription[];
+extern const char kRunVideoCaptureServiceInBrowserProcessName[];
+extern const char kRunVideoCaptureServiceInBrowserProcessDescription[];
extern const char kUseAngleName[];
extern const char kUseAngleDescription[];
@@ -1765,6 +1760,9 @@
extern const char kUseWinrtMidiApiDescription[];
#if BUILDFLAG(ENABLE_PRINTING)
+extern const char kGdiTextPrinting[];
+extern const char kGdiTextPrintingDescription[];
+
extern const char kPrintWithReducedRasterizationName[];
extern const char kPrintWithReducedRasterizationDescription[];
@@ -2300,15 +2298,6 @@
#endif // #if defined(OS_CHROMEOS)
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-
-#if BUILDFLAG(USE_TCMALLOC)
-extern const char kDynamicTcmallocName[];
-extern const char kDynamicTcmallocDescription[];
-#endif // BUILDFLAG(USE_TCMALLOC)
-
-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
-
// All views-based platforms --------------------------------------------------
#if defined(TOOLKIT_VIEWS)
@@ -2336,13 +2325,6 @@
#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
-extern const char kClickToCallUIName[];
-extern const char kClickToCallUIDescription[];
-
-#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
-
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
defined(OS_CHROMEOS)
@@ -2378,6 +2360,18 @@
#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if BUILDFLAG(USE_TCMALLOC)
+extern const char kDynamicTcmallocName[];
+extern const char kDynamicTcmallocDescription[];
+#endif // BUILDFLAG(USE_TCMALLOC)
+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
+
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+extern const char kUserDataSnapshotName[];
+extern const char kUserDataSnapshotDescription[];
+#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+
// Feature flags --------------------------------------------------------------
#if defined(DCHECK_IS_CONFIGURABLE)
@@ -2385,6 +2379,11 @@
extern const char kDcheckIsFatalDescription[];
#endif // defined(DCHECK_IS_CONFIGURABLE)
+#if BUILDFLAG(ENABLE_CLICK_TO_CALL)
+extern const char kClickToCallUIName[];
+extern const char kClickToCallUIDescription[];
+#endif // BUILDFLAG(ENABLE_CLICK_TO_CALL)
+
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
extern const char kDiceWebSigninInterceptionName[];
extern const char kDiceWebSigninInterceptionDescription[];
@@ -2401,12 +2400,9 @@
#endif // ENABLE_PAINT_PREVIEW && defined(OS_ANDROID)
#if BUILDFLAG(ENABLE_PLUGINS)
-
#if defined(OS_CHROMEOS)
-
extern const char kPdfAnnotations[];
extern const char kPdfAnnotationsDescription[];
-
#endif // defined(OS_CHROMEOS)
extern const char kPdfFormSaveName[];
@@ -2414,9 +2410,16 @@
extern const char kPdfTwoUpViewName[];
extern const char kPdfTwoUpViewDescription[];
-
#endif // BUILDFLAG(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
+extern const char kWebUITabStripName[];
+extern const char kWebUITabStripDescription[];
+
+extern const char kWebUITabStripDemoOptionsName[];
+extern const char kWebUITabStripDemoOptionsDescription[];
+#endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
+
#if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
extern const char kAutofillCreditCardUploadName[];
@@ -2424,30 +2427,11 @@
#endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
-extern const char kPaintHoldingName[];
-extern const char kPaintHoldingDescription[];
-
#if defined(WEBRTC_USE_PIPEWIRE)
-
extern const char kWebrtcPipeWireCapturerName[];
extern const char kWebrtcPipeWireCapturerDescription[];
-
#endif // #if defined(WEBRTC_USE_PIPEWIRE)
-#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-
-extern const char kUserDataSnapshotName[];
-extern const char kUserDataSnapshotDescription[];
-
-#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-
-#if defined(OS_WIN)
-
-extern const char kRunVideoCaptureServiceInBrowserProcessName[];
-extern const char kRunVideoCaptureServiceInBrowserProcessDescription[];
-
-#endif // defined(OS_WIN)
-
// ============================================================================
// Don't just add flags to the end, put them in the right section in
// alphabetical order. See top instructions for more.
