aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc27
1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index d11e9f19061f..ce657d252339 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-10-08 06:25:42 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-12-31 00:57:25 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -112,7 +112,7 @@
- #include "ui/accessibility/accessibility_features.h"
+@@ -117,7 +117,7 @@
+ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,7 +9,16 @@
#include "ui/display/screen.h"
#endif
-@@ -361,7 +361,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -137,7 +137,7 @@
+ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/ozone/public/ozone_platform.h"
+ #endif
+
+@@ -365,7 +365,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +27,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -369,7 +369,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -27,12 +36,12 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if defined(OS_MAC)
-@@ -390,7 +390,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -394,7 +394,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
- #if defined(USE_OZONE)
- const bool show_custom_chrome_frame =
- features::IsUsingOzonePlatform() &&
+ bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
+ ->GetPlatformRuntimeProperties()
+ .supports_server_side_window_decorations;