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

refactor: use C++20's contains() method (#45742)

Browse source 
* chore: use std::map<>::contains() instead of count() or find()

* chore: use std::map<>::contains() instead of base::Contains()
This commit is contained in:
Charles Kerr 2025-02-21 17:33:43 -06:00 • committed by GitHub
parent 612da3ec47
commit 2a383e9ddd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 54 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/usb/electron_usb_delegate.cc
View file

@ -7,7 +7,6 @@
#include <string_view>
#include <utility>
#include "base/containers/contains.h"
#include "base/observer_list.h"
#include "base/scoped_observation.h"
#include "content/public/browser/render_frame_host.h"
@ -72,7 +71,7 @@ bool IsDevicePermissionAutoGranted(
// Note: The `DeviceHasInterfaceWithClass()` call is made after checking the
// origin, since that method call is expensive.
if (origin.scheme() == extensions::kExtensionScheme &&
base::Contains(kSmartCardPrivilegedExtensionIds, origin.host()) &&
kSmartCardPrivilegedExtensionIds.contains(origin.host()) &&
DeviceHasInterfaceWithClass(device_info,
device::mojom::kUsbSmartCardClass)) {
return true;
@ -269,7 +268,7 @@ ElectronUsbDelegate::ContextObservation*
ElectronUsbDelegate::GetContextObserver(
content::BrowserContext* browser_context) {
CHECK(browser_context);
if (!base::Contains(observations_, browser_context)) {
if (!observations_.contains(browser_context)) {
observations_.emplace(browser_context, std::make_unique<ContextObservation>(
this, browser_context));
}

12
shell/browser/usb/usb_chooser_context.cc
View file

@ -8,7 +8,6 @@
#include <utility>
#include <vector>
#include "base/containers/contains.h"
#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/values.h"
@ -158,7 +157,7 @@ UsbChooserContext::~UsbChooserContext() {
void UsbChooserContext::RevokeDevicePermissionWebInitiated(
const url::Origin& origin,
const device::mojom::UsbDeviceInfo& device) {
DCHECK(base::Contains(devices_, device.guid));
DCHECK(devices_.contains(device.guid));
RevokeObjectPermissionInternal(origin, DeviceInfoToValue(device),
/*revoked_by_website=*/true);
}
@ -217,8 +216,7 @@ bool UsbChooserContext::HasDevicePermission(
const url::Origin& origin,
const device::mojom::UsbDeviceInfo& device_info) {
auto it = ephemeral_devices_.find(origin);
if (it != ephemeral_devices_.end() &&
base::Contains(it->second, device_info.guid)) {
if (it != ephemeral_devices_.end() && it->second.contains(device_info.guid)) {
return true;
}
@ -284,7 +282,7 @@ void UsbChooserContext::OnDeviceAdded(
device::mojom::UsbDeviceInfoPtr device_info) {
DCHECK(device_info);
// Update the device list.
DCHECK(!base::Contains(devices_, device_info->guid));
DCHECK(!devices_.contains(device_info->guid));
if (!ShouldExposeDevice(*device_info))
return;
devices_.insert(std::make_pair(device_info->guid, device_info->Clone()));
@ -299,12 +297,12 @@ void UsbChooserContext::OnDeviceRemoved(
DCHECK(device_info);
if (!ShouldExposeDevice(*device_info)) {
DCHECK(!base::Contains(devices_, device_info->guid));
DCHECK(!devices_.contains(device_info->guid));
return;
}
// Update the device list.
DCHECK(base::Contains(devices_, device_info->guid));
DCHECK(devices_.contains(device_info->guid));
devices_.erase(device_info->guid);
// Notify all device observers.