diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_channel__info__posix.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_channel__info__posix.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index b71431a64f77..975b44d90cf8 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,20 +1,20 @@ ---- chrome/common/channel_info_posix.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/common/channel_info_posix.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/common/channel_info_posix.cc -@@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() { - } - } +@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name -@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environment* env) { +@@ -99,7 +99,7 @@ std::string GetDesktopName(base::Environment* env) { return "chromium-browser.desktop"; #endif } --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) version_info::Channel GetChannel() { return GetChannelImpl(nullptr); |