diff options
Diffstat (limited to 'www/iridium/files/patch-chrome_common_chrome__paths.cc')
| -rw-r--r-- | www/iridium/files/patch-chrome_common_chrome__paths.cc | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc index 5fd257b0521b..8f8695168ae5 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.cc +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2019-04-05 00:49:06 UTC +--- chrome/common/chrome_paths.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/common/chrome_paths.cc -@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD +@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif @@ -9,12 +9,13 @@ // 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 defined(GOOGLE_CHROME_BUILD) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); - #endif // defined(GOOGLE_CHROME_BUILD) + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) // The path to the hint file that tells the pepper plugin loader // where it can find the latest component updated flash. @@ -23,9 +24,9 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL( -@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + // The name of the hint file that tells the latest component updated Widevine +@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -34,30 +35,26 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) { - if (!base::PathExists(cur)) // We don't want to create this - return false; - break; --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) +@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { - #if defined(GOOGLE_CHROME_BUILD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) -+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); ++ cur = base::FilePath(FILE_PATH_LITERAL( ++ "/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif - #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) || \ +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) ++ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -66,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -74,9 +71,9 @@ +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) - #if defined(GOOGLE_CHROME_BUILD) -@@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) { - #if defined(GOOGLE_CHROME_BUILD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -559,6 +562,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 defined(OS_BSD) @@ -85,7 +82,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -94,7 +91,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) @@ -103,7 +100,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { } cur = cur.Append(kComponentUpdatedFlashHint); break; |