aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_base_webui_web__ui__util.cc')
-rw-r--r--www/chromium/files/patch-ui_base_webui_web__ui__util.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
index 9a4f3d2d6243..26bbeb747546 100644
--- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,11 +1,11 @@
---- ui/base/webui/web_ui_util.cc.orig 2021-01-18 21:29:48 UTC
+--- ui/base/webui/web_ui_util.cc.orig 2021-03-12 23:57:48 UTC
+++ ui/base/webui/web_ui_util.cc
-@@ -221,7 +221,7 @@ void AppendWebUiCssTextDefaults(std::string* html) {
- std::string GetFontFamily() {
- std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY);
+@@ -224,7 +224,7 @@ std::string GetFontFamily() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // 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)
std::string font_name = ui::ResourceBundle::GetSharedInstance()
.GetFont(ui::ResourceBundle::BaseFont)
.GetFontName();