83 lines
3.5 KiB
C++
83 lines
3.5 KiB
C++
--- chrome/common/chrome_paths.cc.orig 2026-03-13 16:54:03 UTC
|
|
+++ chrome/common/chrome_paths.cc
|
|
@@ -31,7 +31,7 @@
|
|
#include "base/apple/foundation_util.h"
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
|
|
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
|
#include "components/policy/core/common/policy_paths.h"
|
|
#endif
|
|
|
|
@@ -47,14 +47,14 @@ std::optional<bool> g_override_using_default_data_dire
|
|
|
|
std::optional<bool> g_override_using_default_data_directory_for_testing;
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// 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 BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
|
|
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
|
|
#else
|
|
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
|
|
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
|
|
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
@@ -175,7 +175,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
}
|
|
break;
|
|
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
|
|
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
if (!GetUserDownloadsDirectorySafe(&cur)) {
|
|
return false;
|
|
}
|
|
@@ -405,13 +405,13 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
break;
|
|
}
|
|
#endif
|
|
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
|
|
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
|
case chrome::DIR_POLICY_FILES: {
|
|
cur = base::FilePath(policy::kPolicyPath);
|
|
break;
|
|
}
|
|
#endif
|
|
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
|
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
|
|
(BUILDFLAG(IS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
|
|
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
|
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
|
|
@@ -421,7 +421,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
break;
|
|
}
|
|
#endif
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
|
|
cur = base::FilePath(kFilepathSinglePrefExtensions);
|
|
break;
|
|
@@ -460,7 +460,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE) && \
|
|
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
|
|
- BUILDFLAG(IS_ANDROID))
|
|
+ BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD)
|
|
case chrome::DIR_NATIVE_MESSAGING:
|
|
#if BUILDFLAG(IS_MAC)
|
|
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
@@ -477,6 +477,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 BUILDFLAG(IS_FREEBSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL(
|
|
+ "/usr/local/etc/chromium/native-messaging-hosts"));
|
|
#elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/opt/chrome_for_testing/native-messaging-hosts"));
|