Disable device bound session: fix windows build
This commit is contained in:
@@ -7,11 +7,11 @@ see https://w3c.github.io/webappsec-dbsc/#privacy-considerations
|
||||
|
||||
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
---
|
||||
.../metrics/chrome_browser_main_extra_parts_metrics.cc | 6 ++++++
|
||||
net/BUILD.gn | 7 +++++++
|
||||
net/base/features.cc | 7 ++++---
|
||||
net/features.gni | 2 +-
|
||||
4 files changed, 18 insertions(+), 4 deletions(-)
|
||||
.../metrics/chrome_browser_main_extra_parts_metrics.cc | 6 ++++++
|
||||
net/BUILD.gn | 7 +++++++
|
||||
net/base/features.cc | 10 ++++++----
|
||||
net/features.gni | 2 +-
|
||||
4 files changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
||||
@@ -57,18 +57,20 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
|
||||
diff --git a/net/base/features.cc b/net/base/features.cc
|
||||
--- a/net/base/features.cc
|
||||
+++ b/net/base/features.cc
|
||||
@@ -356,12 +356,13 @@ BASE_FEATURE(kUseNetworkPathMonitorForNetworkChangeNotifier,
|
||||
@@ -356,12 +356,14 @@ BASE_FEATURE(kUseNetworkPathMonitorForNetworkChangeNotifier,
|
||||
);
|
||||
#endif // BUILDFLAG(IS_APPLE)
|
||||
|
||||
-#if BUILDFLAG(IS_WIN)
|
||||
-BASE_FEATURE(kDeviceBoundSessions, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+#if BUILDFLAG(IS_WIN) && BUILDFLAG(ENABLE_DEVICE_BOUND_SESSIONS)
|
||||
+BASE_FEATURE(kDeviceBoundSessions, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+BASE_FEATURE(kPersistDeviceBoundSessions, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
#else
|
||||
-#else
|
||||
BASE_FEATURE(kDeviceBoundSessions, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+BASE_FEATURE(kPersistDeviceBoundSessions, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+BASE_FEATURE(kPersistDeviceBoundSessions,
|
||||
+#if BUILDFLAG(IS_WIN) && BUILDFLAG(ENABLE_DEVICE_BOUND_SESSIONS)
|
||||
+ base::FEATURE_ENABLED_BY_DEFAULT
|
||||
+#else
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT
|
||||
+);
|
||||
#endif
|
||||
-BASE_FEATURE(kPersistDeviceBoundSessions, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
BASE_FEATURE_PARAM(bool,
|
||||
|
||||
Reference in New Issue
Block a user