diff --git a/shell/browser/ui/accelerator_util.cc b/shell/browser/ui/accelerator_util.cc index fa80d725b36..70954cd80c5 100644 --- a/shell/browser/ui/accelerator_util.cc +++ b/shell/browser/ui/accelerator_util.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include "base/logging.h" @@ -16,7 +17,7 @@ namespace accelerator_util { -bool StringToAccelerator(const std::string& shortcut, +bool StringToAccelerator(const std::string_view shortcut, ui::Accelerator* accelerator) { if (!base::IsStringASCII(shortcut)) { LOG(ERROR) << "The accelerator string can only contain ASCII characters, " @@ -26,14 +27,14 @@ bool StringToAccelerator(const std::string& shortcut, return false; } - std::vector tokens = base::SplitString( + const std::vector tokens = base::SplitStringPiece( shortcut, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); // Now, parse it into an accelerator. int modifiers = ui::EF_NONE; ui::KeyboardCode key = ui::VKEY_UNKNOWN; std::optional shifted_char; - for (const auto& token : tokens) { + for (const std::string_view token : tokens) { ui::KeyboardCode code = electron::KeyboardCodeFromStr(token, &shifted_char); if (shifted_char) modifiers |= ui::EF_SHIFT_DOWN; diff --git a/shell/browser/ui/accelerator_util.h b/shell/browser/ui/accelerator_util.h index 3e88451a2b7..0fe816aa48a 100644 --- a/shell/browser/ui/accelerator_util.h +++ b/shell/browser/ui/accelerator_util.h @@ -6,7 +6,7 @@ #define ELECTRON_SHELL_BROWSER_UI_ACCELERATOR_UTIL_H_ #include -#include +#include #include "base/memory/raw_ptr.h" #include "shell/browser/ui/electron_menu_model.h" @@ -21,7 +21,7 @@ typedef struct { typedef std::map AcceleratorTable; // Parse a string as an accelerator. -bool StringToAccelerator(const std::string& shortcut, +bool StringToAccelerator(std::string_view shortcut, ui::Accelerator* accelerator); // Generate a table that contains menu model's accelerators and command ids. diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc index 56e8bc78767..423aafae6eb 100644 --- a/shell/common/node_bindings.cc +++ b/shell/common/node_bindings.cc @@ -395,14 +395,14 @@ void SetNodeOptions(base::Environment* env) { if (electron::fuses::IsNodeOptionsEnabled()) { std::string options; env->GetVar("NODE_OPTIONS", &options); - std::vector parts = base::SplitString( + const std::vector parts = base::SplitStringPiece( options, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); bool is_packaged_app = electron::api::App::IsPackaged(); - for (const auto& part : parts) { + for (const std::string_view part : parts) { // Strip off values passed to individual NODE_OPTIONs - std::string option = part.substr(0, part.find('=')); + const std::string_view option = part.substr(0, part.find('=')); if (is_packaged_app && !pkg_opts.contains(option)) { // Explicitly disallow majority of NODE_OPTIONS in packaged apps