mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: replace deprecated base::Value::Set<Type>Key usage (#37570)

Browse source 
Co-authored-by: Milan Burda <miburda@microsoft.com>
This commit is contained in:
Milan Burda 2023-03-15 14:07:51 +01:00 • committed by GitHub
parent 061e2e5e73
commit 6dc46e5bcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/hid/hid_chooser_context.cc
View file

@ -70,23 +70,23 @@ bool HidChooserContext::CanStorePersistentEntry(
// static
base::Value HidChooserContext::DeviceInfoToValue(
const device::mojom::HidDeviceInfo& device) {
base::Value value(base::Value::Type::DICT);
value.SetStringKey(
base::Value::Dict value;
value.Set(
kHidDeviceNameKey,
base::UTF16ToUTF8(HidChooserContext::DisplayNameFromDeviceInfo(device)));
value.SetIntKey(kDeviceVendorIdKey, device.vendor_id);
value.SetIntKey(kDeviceProductIdKey, device.product_id);
value.Set(kDeviceVendorIdKey, device.vendor_id);
value.Set(kDeviceProductIdKey, device.product_id);
if (HidChooserContext::CanStorePersistentEntry(device)) {
// Use the USB serial number as a persistent identifier. If it is
// unavailable, only ephemeral permissions may be granted.
value.SetStringKey(kDeviceSerialNumberKey, device.serial_number);
value.Set(kDeviceSerialNumberKey, device.serial_number);
} else {
// The GUID is a temporary ID created on connection that remains valid until
// the device is disconnected. Ephemeral permissions are keyed by this ID
// and must be granted again each time the device is connected.
value.SetStringKey(kHidGuidKey, device.guid);
value.Set(kHidGuidKey, device.guid);
}
return value;
return base::Value(std::move(value));
}
void HidChooserContext::GrantDevicePermission(