diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/device/base | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/device/base')
| -rw-r--r-- | chromium/device/base/device_monitor_win.cc | 1 | ||||
| -rw-r--r-- | chromium/device/base/features.cc | 7 | ||||
| -rw-r--r-- | chromium/device/base/features.h | 1 |
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) |