diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_flag__descriptions.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_flag__descriptions.cc | 68 |
1 files changed, 23 insertions, 45 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index c1a0861a4091..161dfa92d8e6 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,37 +1,33 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-01-20 10:35:49 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-02-07 13:39:41 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5258,7 +5258,7 @@ const char kDownloadShelfWebUIDescription[] = - +@@ -5314,7 +5314,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) const char kWebUIBrandingUpdateName[] = "WebUI Branding Update"; -@@ -5276,10 +5276,10 @@ const char kSettingsLandingPageRedesignDescription[] = - "Changes the layout of the chrome://settings page to only show one section " - "at a time."; - --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + const char kWebUIBrandingUpdateDescription[] = +@@ -5329,7 +5329,7 @@ const char kWebuiFeedbackDescription[] = // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_FUCHSIA) ++ defined(OS_FUCHSIA) || defined(OS_BSD) const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5295,7 +5295,7 @@ const char kDesktopDetailedLanguageSettingsName[] = - const char kDesktopDetailedLanguageSettingsDescription[] = - "Enable the new detailed language settings page"; +@@ -5348,7 +5348,7 @@ const char kDesktopDetailedLanguageSettingsDescription + #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || + // defined(OS_FUCHSIA) --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_CHROMEOS) || defined(OS_LINUX) +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) #if BUILDFLAG(USE_TCMALLOC) -@@ -5320,7 +5320,7 @@ const char kWebShareDescription[] = + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; + const char kDynamicTcmallocDescription[] = +@@ -5364,7 +5364,7 @@ const char kWebShareDescription[] = "platforms."; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) @@ -40,30 +36,12 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5330,7 +5330,7 @@ const char kOzonePlatformHintName[] = "Preferred Ozone - const char kOzonePlatformHintDescription[] = - "Selects the preferred platform backend used on Linux. The default one is " - "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - - // Feature flags -------------------------------------------------------------- - -@@ -5422,7 +5422,7 @@ const char kAutofillCreditCardUploadDescription[] = - - #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) - --#if !defined(OS_WIN) && !defined(OS_FUCHSIA) -+#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - const char kSendWebUIJavaScriptErrorReportsName[] = - "Send WebUI JavaScript Error Reports"; - const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5437,7 +5437,7 @@ const char kElasticOverscrollDescription[] = - "Enables Elastic Overscrolling on touchscreens and precision touchpads."; +@@ -5482,7 +5482,7 @@ const char kElasticOverscrollDescription[] = #endif // defined(OS_WIN) || defined(OS_ANDROID) --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) + #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- defined(OS_MAC) || defined(OS_FUCHSIA) ++ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = + "Enables additional keyboard shortcuts to help debugging."; |