diff options
Diffstat (limited to 'devel/electron33/files/patch-chrome_common_chrome__paths.cc')
-rw-r--r-- | devel/electron33/files/patch-chrome_common_chrome__paths.cc | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/devel/electron33/files/patch-chrome_common_chrome__paths.cc b/devel/electron33/files/patch-chrome_common_chrome__paths.cc deleted file mode 100644 index 118d5f81ca60..000000000000 --- a/devel/electron33/files/patch-chrome_common_chrome__paths.cc +++ /dev/null @@ -1,84 +0,0 @@ ---- chrome/common/chrome_paths.cc.orig 2024-06-18 21:43:25 UTC -+++ chrome/common/chrome_paths.cc -@@ -30,7 +30,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 - -@@ -52,14 +52,14 @@ namespace { - - 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) -@@ -225,7 +225,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; - } -@@ -541,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { - 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: { - cur = base::FilePath(policy::kPolicyPath); - break; -@@ -552,7 +552,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; -@@ -561,7 +561,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; -@@ -599,7 +599,7 @@ bool PathProvider(int key, base::FilePath* result) { - break; - - #if BUILDFLAG(ENABLE_EXTENSIONS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) -+ (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) -@@ -613,6 +613,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")); |