summaryrefslogtreecommitdiff
path: root/chromium/device/base
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/device/base')
-rw-r--r--chromium/device/base/device_monitor_win.cc1
-rw-r--r--chromium/device/base/features.cc7
-rw-r--r--chromium/device/base/features.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/chromium/device/base/device_monitor_win.cc b/chromium/device/base/device_monitor_win.cc
index faf45748f60..613ef26aad1 100644
--- a/chromium/device/base/device_monitor_win.cc
+++ b/chromium/device/base/device_monitor_win.cc
@@ -15,6 +15,7 @@
#include "base/at_exit.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/chromium/device/base/features.cc b/chromium/device/base/features.cc
index e3dae0de35d..e2bb9c2f442 100644
--- a/chromium/device/base/features.cc
+++ b/chromium/device/base/features.cc
@@ -13,6 +13,13 @@ const base::Feature kNewUsbBackend{"NewUsbBackend",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kNewBLEWinImplementation{"NewBLEWinImplementation",
base::FEATURE_ENABLED_BY_DEFAULT};
+
+// Controls whether a more reliable GATT session handling
+// implementation is used on Windows 10 1709 (RS3) and beyond.
+//
+// Disabled due to crbug/1120338.
+const base::Feature kNewBLEGattSessionHandling{
+ "NewBLEGattSessionHandling", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // defined(OS_WIN)
#if BUILDFLAG(ENABLE_VR)
diff --git a/chromium/device/base/features.h b/chromium/device/base/features.h
index be3d3c9135f..7c24b68685d 100644
--- a/chromium/device/base/features.h
+++ b/chromium/device/base/features.h
@@ -15,6 +15,7 @@ namespace device {
#if defined(OS_WIN)
DEVICE_BASE_EXPORT extern const base::Feature kNewUsbBackend;
DEVICE_BASE_EXPORT extern const base::Feature kNewBLEWinImplementation;
+DEVICE_BASE_EXPORT extern const base::Feature kNewBLEGattSessionHandling;
#endif // defined(OS_WIN)
#if BUILDFLAG(ENABLE_VR)