summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_chrome__paths.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.h')
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.h28
1 files changed, 16 insertions, 12 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index 9fca877cf783..4ab66fec7521 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,15 +1,19 @@
---- chrome/common/chrome_paths.h.orig 2021-01-18 21:28:52 UTC
+--- chrome/common/chrome_paths.h.orig 2021-03-12 23:57:19 UTC
+++ chrome/common/chrome_paths.h
-@@ -51,7 +51,7 @@ enum {
- // contains subdirectories.
+@@ -53,9 +53,9 @@ enum {
#endif
- #if defined(OS_CHROMEOS) || \
-- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC)
-+ (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD)
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(OS_CHROMEOS) || \
+- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+- BUILDFLAG(CHROMIUM_BRANDING)) || \
++#if defined(OS_CHROMEOS) || \
++ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \
++ BUILDFLAG(CHROMIUM_BRANDING)) || \
+ defined(OS_MAC)
DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
// on Chrome Mac and Chromium Linux.
- // On Chrome OS, this path is used for OEM
-@@ -59,7 +59,7 @@ enum {
+@@ -64,7 +64,7 @@ enum {
// create it.
#endif
@@ -18,10 +22,10 @@
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
-@@ -116,7 +116,7 @@ enum {
- DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
- // supervised user whitelists are
- // installed.
+@@ -118,7 +118,7 @@ enum {
+ DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers
+ // reside.
+ #endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
DIR_NATIVE_MESSAGING, // System directory where native messaging host