summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_base__switches.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_base__switches.h')
-rw-r--r--www/chromium/files/patch-base_base__switches.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h
index e251bbebd896..c3627665a8a3 100644
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@@ -1,15 +1,17 @@
---- base/base_switches.h.orig 2020-11-13 06:36:34 UTC
+--- base/base_switches.h.orig 2021-03-12 23:57:15 UTC
+++ base/base_switches.h
-@@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[];
- extern const char kDisableUsbKeyboardDetect[];
- #endif
+@@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[];
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || 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_ASH) && \
+- !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++ !BUILDFLAG(IS_CHROMEOS_LACROS))
extern const char kDisableDevShmUsage[];
#endif
-@@ -55,7 +55,7 @@ extern const char kEnableIdleTracing[];
+@@ -58,7 +58,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
#endif