diff options
Diffstat (limited to 'devel/electron6/files/patch-chrome_common_chrome__paths.cc')
-rw-r--r-- | devel/electron6/files/patch-chrome_common_chrome__paths.cc | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/devel/electron6/files/patch-chrome_common_chrome__paths.cc b/devel/electron6/files/patch-chrome_common_chrome__paths.cc deleted file mode 100644 index 1061b9d4b9be..000000000000 --- a/devel/electron6/files/patch-chrome_common_chrome__paths.cc +++ /dev/null @@ -1,113 +0,0 @@ ---- chrome/common/chrome_paths.cc.orig 2019-09-10 11:13:45 UTC -+++ chrome/common/chrome_paths.cc -@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD - FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_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 defined(GOOGLE_CHROME_BUILD) - FILE_PATH_LITERAL("/usr/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) - - // The path to the hint file that tells the pepper plugin loader - // where it can find the latest component updated flash. - const base::FilePath::CharType kComponentUpdatedFlashHint[] = - FILE_PATH_LITERAL("latest-component-updated-flash"); --#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) { - return false; - break; - case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - if (!GetUserDownloadsDirectorySafe(&cur)) - return false; - break; -@@ -459,17 +459,19 @@ 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) - case chrome::DIR_POLICY_FILES: { - #if defined(GOOGLE_CHROME_BUILD) - 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")); - #else - cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); - #endif - break; - } - #endif --#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || defined(OS_BSD) || \ - defined(OS_MACOSX) - case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { - if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { - break; - } - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { - cur = base::FilePath(kFilepathSinglePrefExtensions); - break; -@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { - #endif - break; - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#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) - cur = base::FilePath(FILE_PATH_LITERAL( - "/etc/opt/chrome/native-messaging-hosts")); -+#elif defined(OS_BSD) -+ cur = base::FilePath(FILE_PATH_LITERAL( -+ "/usr/local/etc/chrome/native-messaging-hosts")); - #else - cur = base::FilePath(FILE_PATH_LITERAL( - "/etc/chromium/native-messaging-hosts")); -@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); - break; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - #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) { - cur = cur.Append(kGCMStoreDirname); - break; - #endif // !defined(OS_ANDROID) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - 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) { - } - cur = cur.Append(kComponentUpdatedFlashHint); - break; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - case chrome::FILE_CHROME_OS_COMPONENT_FLASH: - cur = base::FilePath(kChromeOSComponentFlash); |