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

7
shell/browser/hid/electron_hid_delegate.cc
View file

@ -7,7 +7,6 @@
#include <string>
#include <utility>
#include "base/containers/contains.h"
#include "base/scoped_observation.h"
#include "chrome/common/chrome_features.h"
#include "content/public/browser/web_contents.h"
@ -118,7 +117,7 @@ std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
// Start observing HidChooserContext for permission and device events.
GetContextObserver(browser_context);
DCHECK(base::Contains(observations_, browser_context));
DCHECK(observations_.contains(browser_context));
HidChooserController* controller = ControllerForFrame(render_frame_host);
if (controller) {
@ -188,7 +187,7 @@ void ElectronHidDelegate::RemoveObserver(
content::HidDelegate::Observer* observer) {
if (!browser_context)
return;
DCHECK(base::Contains(observations_, browser_context));
DCHECK(observations_.contains(browser_context));
GetContextObserver(browser_context)->RemoveObserver(observer);
}
@ -222,7 +221,7 @@ bool ElectronHidDelegate::IsServiceWorkerAllowedForOrigin(
ElectronHidDelegate::ContextObservation*
ElectronHidDelegate::GetContextObserver(
content::BrowserContext* browser_context) {
if (!base::Contains(observations_, browser_context)) {
if (!observations_.contains(browser_context)) {
observations_.emplace(browser_context, std::make_unique<ContextObservation>(
this, browser_context));
}

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

@ -8,7 +8,6 @@
#include <utility>
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/map_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@ -94,7 +93,7 @@ base::Value HidChooserContext::DeviceInfoToValue(
void HidChooserContext::GrantDevicePermission(
const url::Origin& origin,
const device::mojom::HidDeviceInfo& device) {
DCHECK(base::Contains(devices_, device.guid));
DCHECK(devices_.contains(device.guid));
if (CanStorePersistentEntry(device)) {
auto* permission_manager = static_cast<ElectronPermissionManager*>(
browser_context_->GetPermissionControllerDelegate());
@ -111,7 +110,7 @@ void HidChooserContext::GrantDevicePermission(
void HidChooserContext::RevokeDevicePermission(
const url::Origin& origin,
const device::mojom::HidDeviceInfo& device) {
DCHECK(base::Contains(devices_, device.guid));
DCHECK(devices_.contains(device.guid));
if (CanStorePersistentEntry(device)) {
RevokePersistentDevicePermission(origin, device);
} else {
@ -167,8 +166,7 @@ bool HidChooserContext::HasDevicePermission(
return false;
auto it = ephemeral_devices_.find(origin);
if (it != ephemeral_devices_.end() &&
base::Contains(it->second, device.guid)) {
if (it != ephemeral_devices_.end() && it->second.contains(device.guid)) {
return true;
}
@ -189,7 +187,7 @@ bool HidChooserContext::IsFidoAllowedForOrigin(const url::Origin& origin) {
});
if (origin.scheme() == extensions::kExtensionScheme &&
base::Contains(kPrivilegedExtensionIds, origin.host())) {
kPrivilegedExtensionIds.contains(origin.host())) {
return true;
}
#endif // BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
@ -245,7 +243,7 @@ void HidChooserContext::DeviceAdded(device::mojom::HidDeviceInfoPtr device) {
DCHECK(device);
// Update the device list.
if (!base::Contains(devices_, device->guid))
if (!devices_.contains(device->guid))
devices_.insert({device->guid, device->Clone()});
// Notify all observers.
@ -255,7 +253,7 @@ void HidChooserContext::DeviceAdded(device::mojom::HidDeviceInfoPtr device) {
void HidChooserContext::DeviceRemoved(device::mojom::HidDeviceInfoPtr device) {
DCHECK(device);
DCHECK(base::Contains(devices_, device->guid));
DCHECK(devices_.contains(device->guid));
// Update the device list.
devices_.erase(device->guid);
@ -276,7 +274,7 @@ void HidChooserContext::DeviceRemoved(device::mojom::HidDeviceInfoPtr device) {
void HidChooserContext::DeviceChanged(device::mojom::HidDeviceInfoPtr device) {
DCHECK(device);
DCHECK(base::Contains(devices_, device->guid));
DCHECK(devices_.contains(device->guid));
// Update the device list.
devices_[device->guid] = device->Clone();