Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-chrome_common_chrome__paths.cc
| --- chrome/common/chrome_paths.cc.orig 2019-12-16 21:50:44 UTC | --- chrome/common/chrome_paths.cc.orig 2020-03-03 18:53:03 UTC | ||||
| +++ chrome/common/chrome_paths.cc | +++ chrome/common/chrome_paths.cc | ||||
| @@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD | @@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD | ||||
| FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); | FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); | ||||
| #endif | #endif | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| // The path to the external extension <id>.json files. | // The path to the external extension <id>.json files. | ||||
| Show All 20 Lines | @@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| return false; | return false; | ||||
| break; | break; | ||||
| case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: | case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: | ||||
| -#if defined(OS_WIN) || defined(OS_LINUX) | -#if defined(OS_WIN) || defined(OS_LINUX) | ||||
| +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) | ||||
| if (!GetUserDownloadsDirectorySafe(&cur)) | if (!GetUserDownloadsDirectorySafe(&cur)) | ||||
| return false; | return false; | ||||
| break; | break; | ||||
| @@ -482,6 +482,9 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| case chrome::DIR_POLICY_FILES: { | case chrome::DIR_POLICY_FILES: { | ||||
| #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||||
| cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); | cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); | ||||
| +#elif defined(OS_BSD) | +#elif defined(OS_BSD) | ||||
| + cur = base::FilePath(FILE_PATH_LITERAL( | + cur = base::FilePath(FILE_PATH_LITERAL( | ||||
| + "/usr/local/etc/chrome/policies")); | + "/usr/local/etc/chrome/policies")); | ||||
| #else | #else | ||||
| cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); | cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); | ||||
| #endif | #endif | ||||
| @@ -502,7 +502,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| } | } | ||||
| #endif | #endif | ||||
| #if defined(OS_CHROMEOS) || \ | #if defined(OS_CHROMEOS) || \ | ||||
| - (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) | - (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) | ||||
| + ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) | + ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) | ||||
| case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { | case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { | ||||
| if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) | if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) | ||||
| return false; | return false; | ||||
| @@ -510,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| break; | break; | ||||
| } | } | ||||
| #endif | #endif | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { | case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { | ||||
| cur = base::FilePath(kFilepathSinglePrefExtensions); | cur = base::FilePath(kFilepathSinglePrefExtensions); | ||||
| break; | break; | ||||
| @@ -545,7 +545,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| #endif | #endif | ||||
| break; | break; | ||||
| -#if defined(OS_LINUX) || defined(OS_MACOSX) | -#if defined(OS_LINUX) || defined(OS_MACOSX) | ||||
| +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) | ||||
| case chrome::DIR_NATIVE_MESSAGING: | case chrome::DIR_NATIVE_MESSAGING: | ||||
| #if defined(OS_MACOSX) | #if defined(OS_MACOSX) | ||||
| #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||||
| @@ -559,6 +559,9 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | #if BUILDFLAG(GOOGLE_CHROME_BRANDING) | ||||
| cur = base::FilePath(FILE_PATH_LITERAL( | cur = base::FilePath(FILE_PATH_LITERAL( | ||||
| "/etc/opt/chrome/native-messaging-hosts")); | "/etc/opt/chrome/native-messaging-hosts")); | ||||
| +#elif defined(OS_BSD) | +#elif defined(OS_BSD) | ||||
| + cur = base::FilePath(FILE_PATH_LITERAL( | + cur = base::FilePath(FILE_PATH_LITERAL( | ||||
| + "/usr/local/etc/chrome/native-messaging-hosts")); | + "/usr/local/etc/chrome/native-messaging-hosts")); | ||||
| #else | #else | ||||
| cur = base::FilePath(FILE_PATH_LITERAL( | cur = base::FilePath(FILE_PATH_LITERAL( | ||||
| "/etc/chromium/native-messaging-hosts")); | "/etc/chromium/native-messaging-hosts")); | ||||
| @@ -571,7 +574,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| return false; | return false; | ||||
| cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); | cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); | ||||
| break; | break; | ||||
| -#endif // defined(OS_LINUX) || defined(OS_MACOSX) | -#endif // defined(OS_LINUX) || defined(OS_MACOSX) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) | ||||
| #if !defined(OS_ANDROID) | #if !defined(OS_ANDROID) | ||||
| case chrome::DIR_GLOBAL_GCM_STORE: | case chrome::DIR_GLOBAL_GCM_STORE: | ||||
| if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) | if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) | ||||
| @@ -579,7 +582,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| cur = cur.Append(kGCMStoreDirname); | cur = cur.Append(kGCMStoreDirname); | ||||
| break; | break; | ||||
| #endif // !defined(OS_ANDROID) | #endif // !defined(OS_ANDROID) | ||||
| -#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
| case chrome::FILE_COMPONENT_FLASH_HINT: | case chrome::FILE_COMPONENT_FLASH_HINT: | ||||
| if (!base::PathService::Get( | if (!base::PathService::Get( | ||||
| chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { | chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { | ||||
| @@ -587,7 +590,7 @@ bool PathProvider(int key, base::FilePath* result) { | @@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||||
| } | } | ||||
| cur = cur.Append(kComponentUpdatedFlashHint); | cur = cur.Append(kComponentUpdatedFlashHint); | ||||
| break; | break; | ||||
| -#endif // defined(OS_LINUX) | -#endif // defined(OS_LINUX) | ||||
| +#endif // defined(OS_LINUX) || defined(OS_BSD) | +#endif // defined(OS_LINUX) || defined(OS_BSD) | ||||
| #if defined(OS_CHROMEOS) | #if defined(OS_CHROMEOS) | ||||
| case chrome::FILE_CHROME_OS_COMPONENT_FLASH: | case chrome::FILE_CHROME_OS_COMPONENT_FLASH: | ||||
| cur = base::FilePath(kChromeOSComponentFlash); | cur = base::FilePath(kChromeOSComponentFlash); | ||||