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 | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index bb3950a4f798..c1a0861a4091 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5110,7 +5110,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -5258,7 +5258,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- @@ -8,8 +8,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) - const char kEnableOopPrintDriversName[] = -@@ -5134,10 +5134,10 @@ const char kSettingsLandingPageRedesignDescription[] = + 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."; @@ -22,7 +22,7 @@ const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5153,7 +5153,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5295,7 +5295,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; @@ -31,21 +31,25 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5178,11 +5178,11 @@ const char kWebShareDescription[] = +@@ -5320,7 +5320,7 @@ const char kWebShareDescription[] = "platforms."; - #endif // defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) --#if defined(OS_LINUX) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - const char kUseOzonePlatformName[] = "Use ozone."; - const char kUseOzonePlatformDescription[] = - "Use the Ozone/X11 platform implementation on X11."; --#endif // defined(OS_LINUX) && defined(USE_OZONE) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + 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 -------------------------------------------------------------- -@@ -5249,7 +5249,7 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -5422,7 +5422,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -54,7 +58,7 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5264,7 +5264,7 @@ const char kElasticOverscrollDescription[] = +@@ -5437,7 +5437,7 @@ const char kElasticOverscrollDescription[] = "Enables Elastic Overscrolling on touchscreens and precision touchpads."; #endif // defined(OS_WIN) || defined(OS_ANDROID) |