github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid deprecated value apis (#37590)

Browse Source 
* fix: use base::Value::Dict:::Remove() instead of RemoveKe()

the latter is deprecated.

* fix: use base::Value::Dict::FindString() instead of base::Value::FindStringKey()

The latter is deprecated.

* chore: make lint happy
This commit is contained in:
Charles Kerr
2023-03-20 09:38:45 -05:00
committed by GitHub
parent e0c348a2f8
commit caa5989eed
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/browser/usb/usb_chooser_context.cc
View File

@@ -180,7 +180,10 @@ void UsbChooserContext::RevokeObjectPermissionInternal(
const url::Origin& origin,
const base::Value& object,
bool revoked_by_website = false) {
if (object.FindStringKey(kDeviceSerialNumberKey)) {
const base::Value::Dict* object_dict = object.GetIfDict();
DCHECK(object_dict != nullptr);
if (object_dict->FindString(kDeviceSerialNumberKey) != nullptr) {
auto* permission_manager = static_cast<ElectronPermissionManager*>(
browser_context_->GetPermissionControllerDelegate());
permission_manager->RevokeDevicePermission(
@@ -188,7 +191,7 @@ void UsbChooserContext::RevokeObjectPermissionInternal(
WebContentsPermissionHelper::PermissionType::USB),
origin, object, browser_context_);
} else {
const std::string* guid = object.FindStringKey(kDeviceIdKey);
const std::string* guid = object_dict->FindString(kDeviceIdKey);
auto it = ephemeral_devices_.find(origin);
if (it != ephemeral_devices_.end()) {
it->second.erase(*guid);