diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__features.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_chrome__features.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index da8ebf0e7946..cdc137cf1a76 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2021-01-18 21:28:52 UTC +--- chrome/common/chrome_features.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/common/chrome_features.cc -@@ -96,13 +96,13 @@ const base::Feature kAsyncDns { +@@ -92,13 +92,13 @@ const base::Feature kAsyncDns { #endif }; @@ -14,21 +14,21 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -343,13 +343,13 @@ const base::Feature kEarlyLibraryLoad{"EarlyLibraryLoa - const base::Feature kEnableAllSystemWebApps{"EnableAllSystemWebApps", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -348,13 +348,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ -+#if defined(OS_WIN) || (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_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) COMPONENT_EXPORT(CHROME_FEATURES) // Enables ephemeral Guest profiles on desktop. extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{ "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || - // defined(OS_MAC) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) |