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

9
shell/browser/api/electron_api_global_shortcut.cc
View file

@ -7,7 +7,6 @@
#include <string>
#include <vector>
#include "base/containers/contains.h"
#include "base/strings/utf_string_conversions.h"
#include "base/uuid.h"
#include "components/prefs/pref_service.h"
@ -58,7 +57,7 @@ GlobalShortcut::~GlobalShortcut() {
}
void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
if (!base::Contains(accelerator_callback_map_, accelerator)) {
if (!accelerator_callback_map_.contains(accelerator)) {
// This should never occur, because if it does,
// ui::GlobalAcceleratorListener notifies us with wrong accelerator.
NOTREACHED();
@ -68,7 +67,7 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
void GlobalShortcut::ExecuteCommand(const extensions::ExtensionId& extension_id,
const std::string& command_id) {
if (!base::Contains(command_callback_map_, command_id)) {
if (!command_callback_map_.contains(command_id)) {
// This should never occur, because if it does, GlobalAcceleratorListener
// notifies us with wrong command.
NOTREACHED();
@ -195,12 +194,12 @@ void GlobalShortcut::UnregisterSome(
}
bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
if (base::Contains(accelerator_callback_map_, accelerator)) {
if (accelerator_callback_map_.contains(accelerator)) {
return true;
}
const std::string command_str =
extensions::Command::AcceleratorToString(accelerator);
return base::Contains(command_callback_map_, command_str);
return command_callback_map_.contains(command_str);
}
void GlobalShortcut::UnregisterAll() {