diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__paths.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__paths.cc | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index bca2440a07b4..92a4c9976136 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2021-01-18 21:28:52 UTC +--- chrome/common/chrome_paths.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/common/chrome_paths.cc -@@ -47,21 +47,29 @@ namespace { +@@ -48,21 +48,29 @@ namespace { const base::FilePath::CharType kPepperFlashBaseDirectory[] = FILE_PATH_LITERAL("PepperFlash"); @@ -32,7 +32,7 @@ #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -@@ -182,7 +190,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -183,7 +191,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -41,7 +41,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -453,6 +461,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -447,6 +455,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); @@ -51,16 +51,20 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -460,7 +471,7 @@ bool PathProvider(int key, base::FilePath* result) { - } +@@ -455,9 +466,9 @@ bool PathProvider(int key, base::FilePath* result) { #endif - #if defined(OS_CHROMEOS) || \ -- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) -+ (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_CHROMEOS) || \ +- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ +- BUILDFLAG(CHROMIUM_BRANDING)) || \ ++#if defined(OS_CHROMEOS) || \ ++ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ ++ BUILDFLAG(CHROMIUM_BRANDING)) || \ + defined(OS_MAC) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) - return false; -@@ -468,7 +479,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -466,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -69,7 +73,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -503,7 +514,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -501,7 +512,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -78,7 +82,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -517,6 +528,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -515,6 +526,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")); @@ -88,7 +92,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -529,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -527,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; |