diff options
Diffstat (limited to 'www/chromium/patches/patch-chrome_common_chrome_paths_cc')
| -rw-r--r-- | www/chromium/patches/patch-chrome_common_chrome_paths_cc | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/www/chromium/patches/patch-chrome_common_chrome_paths_cc b/www/chromium/patches/patch-chrome_common_chrome_paths_cc deleted file mode 100644 index e35cc32..0000000 --- a/www/chromium/patches/patch-chrome_common_chrome_paths_cc +++ /dev/null | |||
| @@ -1,81 +0,0 @@ | |||
| 1 | Index: chrome/common/chrome_paths.cc | ||
| 2 | --- chrome/common/chrome_paths.cc.orig | ||
| 3 | +++ chrome/common/chrome_paths.cc | ||
| 4 | @@ -44,14 +44,14 @@ | ||
| 5 | |||
| 6 | namespace { | ||
| 7 | |||
| 8 | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||
| 9 | +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | ||
| 10 | // The path to the external extension <id>.json files. | ||
| 11 | // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ | ||
| 12 | const base::FilePath::CharType kFilepathSinglePrefExtensions[] = | ||
| 13 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 14 | - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); | ||
| 15 | + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); | ||
| 16 | #else | ||
| 17 | - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); | ||
| 18 | + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); | ||
| 19 | #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 20 | |||
| 21 | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||
| 22 | @@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 23 | return false; | ||
| 24 | break; | ||
| 25 | case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: | ||
| 26 | -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||
| 27 | +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | ||
| 28 | if (!GetUserDownloadsDirectorySafe(&cur)) | ||
| 29 | return false; | ||
| 30 | break; | ||
| 31 | @@ -407,10 +407,12 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 32 | if (!base::PathExists(cur)) // We don't want to create this | ||
| 33 | return false; | ||
| 34 | break; | ||
| 35 | -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) | ||
| 36 | +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) | ||
| 37 | case chrome::DIR_POLICY_FILES: { | ||
| 38 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 39 | cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); | ||
| 40 | +#elif BUILDFLAG(IS_FREEBSD) | ||
| 41 | + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chromium/policies")); | ||
| 42 | #else | ||
| 43 | cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); | ||
| 44 | #endif | ||
| 45 | @@ -422,7 +424,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 46 | #if BUILDFLAG(IS_CHROMEOS_ASH) || \ | ||
| 47 | ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ | ||
| 48 | BUILDFLAG(CHROMIUM_BRANDING)) || \ | ||
| 49 | - BUILDFLAG(IS_MAC) | ||
| 50 | + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) | ||
| 51 | case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { | ||
| 52 | if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) | ||
| 53 | return false; | ||
| 54 | @@ -430,7 +432,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 55 | break; | ||
| 56 | } | ||
| 57 | #endif | ||
| 58 | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||
| 59 | +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | ||
| 60 | case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { | ||
| 61 | cur = base::FilePath(kFilepathSinglePrefExtensions); | ||
| 62 | break; | ||
| 63 | @@ -475,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 64 | break; | ||
| 65 | #endif | ||
| 66 | |||
| 67 | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) | ||
| 68 | +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) | ||
| 69 | case chrome::DIR_NATIVE_MESSAGING: | ||
| 70 | #if BUILDFLAG(IS_MAC) | ||
| 71 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 72 | @@ -489,6 +491,9 @@ bool PathProvider(int key, base::FilePath* result) { | ||
| 73 | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||
| 74 | cur = base::FilePath(FILE_PATH_LITERAL( | ||
| 75 | "/etc/opt/chrome/native-messaging-hosts")); | ||
| 76 | +#elif BUILDFLAG(IS_FREEBSD) | ||
| 77 | + cur = base::FilePath(FILE_PATH_LITERAL( | ||
| 78 | + "/usr/local/etc/chromium/native-messaging-hosts")); | ||
| 79 | #else | ||
| 80 | cur = base::FilePath(FILE_PATH_LITERAL( | ||
| 81 | "/etc/chromium/native-messaging-hosts")); | ||
