aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_chrome__features.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__features.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 9e7679b1e5ba..590df2168c31 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-06-09 22:13:57 UTC
+--- chrome/common/chrome_features.cc.orig 2021-07-19 18:45:10 UTC
+++ chrome/common/chrome_features.cc
-@@ -81,13 +81,13 @@ const base::Feature kAsyncDns {
+@@ -83,13 +83,13 @@ const base::Feature kAsyncDns {
#endif
};
@@ -16,7 +16,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Enable Borealis on Chrome OS.
-@@ -265,7 +265,7 @@ const base::Feature kDesktopPWAsFlashAppNameInsteadOfO
+@@ -282,7 +282,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
// Enables or disables Desktop PWAs to be auto-started on OS login.
const base::Feature kDesktopPWAsRunOnOsLogin {
"DesktopPWAsRunOnOsLogin",
@@ -25,7 +25,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -356,13 +356,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll
+@@ -378,13 +378,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -41,8 +41,8 @@
// BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC)
#if defined(OS_WIN)
-@@ -544,7 +544,7 @@ const base::Feature kIncompatibleApplicationsWarning{
- "IncompatibleApplicationsWarning", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -566,7 +566,7 @@ const base::Feature kIncognitoBrandConsistencyForAndro
+ "IncognitoBrandConsistencyForAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
#endif
-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \