81 lines
3.5 KiB
Text
81 lines
3.5 KiB
Text
Index: chrome/common/chrome_paths.cc
|
|
--- chrome/common/chrome_paths.cc.orig
|
|
+++ chrome/common/chrome_paths.cc
|
|
@@ -48,14 +48,14 @@
|
|
|
|
namespace {
|
|
|
|
-#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)
|
|
@@ -176,7 +176,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
return false;
|
|
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;
|
|
break;
|
|
@@ -418,10 +418,12 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
if (!base::PathExists(cur)) // We don't want to create this
|
|
return false;
|
|
break;
|
|
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
|
|
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
|
case chrome::DIR_POLICY_FILES: {
|
|
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
|
|
+#elif BUILDFLAG(IS_FREEBSD)
|
|
+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chromium/policies"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
|
|
#endif
|
|
@@ -433,7 +435,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
|
|
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
|
|
BUILDFLAG(CHROMIUM_BRANDING)) || \
|
|
- BUILDFLAG(IS_MAC)
|
|
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
|
|
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
|
|
return false;
|
|
@@ -441,7 +443,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;
|
|
@@ -485,7 +487,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
|
break;
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
case chrome::DIR_NATIVE_MESSAGING:
|
|
#if BUILDFLAG(IS_MAC)
|
|
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
@@ -499,6 +501,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"));
|
|
#else
|
|
cur = base::FilePath(FILE_PATH_LITERAL(
|
|
"/etc/chromium/native-messaging-hosts"));
|