diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__paths.cc | 67 |
1 files changed, 26 insertions, 41 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 7069cec0caff..10be66446f93 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2021-12-31 00:57:25 UTC +--- chrome/common/chrome_paths.cc.orig 2022-02-07 13:39:41 UTC +++ chrome/common/chrome_paths.cc -@@ -44,17 +44,25 @@ +@@ -44,14 +44,14 @@ namespace { @@ -9,26 +9,16 @@ // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = -+#if defined(OS_BSD) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -+ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); -+#else +- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); -+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#else -+#if BUILDFLAG(GOOGLE_CHROME_BRANDING) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); +- FILE_PATH_LITERAL("/usr/share/chromium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#endif - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_WIDEVINE) - // The name of the hint file that tells the latest component updated Widevine -@@ -179,7 +187,7 @@ bool PathProvider(int key, base::FilePath* result) { + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -37,26 +27,30 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -416,6 +424,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -411,10 +411,12 @@ bool PathProvider(int key, base::FilePath* result) { + if (!base::PathExists(cur)) // We don't want to create this + return false; + break; +-#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD) ++#if defined(OS_POSIX) && !defined(OS_MAC) case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); -+#elif defined(OS_BSD) -+ cur = base::FilePath(FILE_PATH_LITERAL( -+ "/usr/local/etc/chrome/policies")); ++#elif defined(OS_FREEBSD) ++ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chromium/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -427,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -424,7 +426,7 @@ bool PathProvider(int key, base::FilePath* result) { + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. #if BUILDFLAG(IS_CHROMEOS_ASH) || \ - ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ +- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++ ((defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + defined(OS_MAC) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { - if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) - return false; -@@ -435,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -65,7 +59,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -480,7 +491,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -479,7 +481,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -74,22 +68,13 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -494,6 +505,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -493,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); -+#elif defined(OS_BSD) ++#elif defined(OS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL( -+ "/usr/local/etc/chrome/native-messaging-hosts")); ++ "/usr/local/etc/chromium/native-messaging-hosts")); #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -506,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); - break; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) - #if !defined(OS_ANDROID) - case chrome::DIR_GLOBAL_GCM_STORE: - if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) |