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

chore: replace absl::optional<T> with std::optional<T> (#40928)

Browse source 
* chore: replace absl::optional<T> with std::optional<T>

* IWYU
This commit is contained in:
Milan Burda 2024-01-10 23:23:35 +01:00 • committed by GitHub
parent fac964ac0d
commit 892c9d78a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 419 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

32
shell/browser/extensions/api/scripting/scripting_api.cc
View file

@ -198,14 +198,14 @@ bool GetFileResources(const std::vector<std::string>& files,
using ResourcesLoadedCallback =
base::OnceCallback<void(std::vector<InjectedFileSource>,
absl::optional<std::string>)>;
std::optional<std::string>)>;
// Checks the loaded content of extension resources. Invokes `callback` with
// the constructed file sources on success or with an error on failure.
void CheckLoadedResources(std::vector<std::string> file_names,
ResourcesLoadedCallback callback,
std::vector<std::unique_ptr<std::string>> file_data,
absl::optional<std::string> load_error) {
std::optional<std::string> load_error) {
if (load_error) {
std::move(callback).Run({}, std::move(load_error));
return;
@ -228,7 +228,7 @@ void CheckLoadedResources(std::vector<std::string> file_names,
}
}
std::move(callback).Run(std::move(file_sources), absl::nullopt);
std::move(callback).Run(std::move(file_sources), std::nullopt);
}
// Checks the specified `files` for validity, and attempts to load and localize
@ -582,7 +582,7 @@ ScriptingExecuteScriptFunction::ScriptingExecuteScriptFunction() = default;
ScriptingExecuteScriptFunction::~ScriptingExecuteScriptFunction() = default;
ExtensionFunction::ResponseAction ScriptingExecuteScriptFunction::Run() {
absl::optional<api::scripting::ExecuteScript::Params> params =
std::optional<api::scripting::ExecuteScript::Params> params =
api::scripting::ExecuteScript::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
injection_ = std::move(params->injection);
@ -654,7 +654,7 @@ ExtensionFunction::ResponseAction ScriptingExecuteScriptFunction::Run() {
void ScriptingExecuteScriptFunction::DidLoadResources(
std::vector<InjectedFileSource> file_sources,
absl::optional<std::string> load_error) {
std::optional<std::string> load_error) {
if (load_error) {
Respond(Error(std::move(*load_error)));
return;
@ -749,7 +749,7 @@ ScriptingInsertCSSFunction::ScriptingInsertCSSFunction() = default;
ScriptingInsertCSSFunction::~ScriptingInsertCSSFunction() = default;
ExtensionFunction::ResponseAction ScriptingInsertCSSFunction::Run() {
absl::optional<api::scripting::InsertCSS::Params> params =
std::optional<api::scripting::InsertCSS::Params> params =
api::scripting::InsertCSS::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
@ -793,7 +793,7 @@ ExtensionFunction::ResponseAction ScriptingInsertCSSFunction::Run() {
void ScriptingInsertCSSFunction::DidLoadResources(
std::vector<InjectedFileSource> file_sources,
absl::optional<std::string> load_error) {
std::optional<std::string> load_error) {
if (load_error) {
Respond(Error(std::move(*load_error)));
return;
@ -850,7 +850,7 @@ ScriptingRemoveCSSFunction::ScriptingRemoveCSSFunction() = default;
ScriptingRemoveCSSFunction::~ScriptingRemoveCSSFunction() = default;
ExtensionFunction::ResponseAction ScriptingRemoveCSSFunction::Run() {
absl::optional<api::scripting::RemoveCSS::Params> params =
std::optional<api::scripting::RemoveCSS::Params> params =
api::scripting::RemoveCSS::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
@ -929,7 +929,7 @@ ScriptingRegisterContentScriptsFunction::
~ScriptingRegisterContentScriptsFunction() = default;
ExtensionFunction::ResponseAction ScriptingUpdateContentScriptsFunction::Run() {
absl::optional<api::scripting::UpdateContentScripts::Params> params =
std::optional<api::scripting::UpdateContentScripts::Params> params =
api::scripting::UpdateContentScripts::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
@ -1087,7 +1087,7 @@ void ScriptingRegisterContentScriptsFunction::OnContentScriptFilesValidated(
}
void ScriptingRegisterContentScriptsFunction::OnContentScriptsRegistered(
const absl::optional<std::string>& error) {
const std::optional<std::string>& error) {
if (error.has_value())
Respond(Error(std::move(*error)));
else
@ -1102,11 +1102,11 @@ ScriptingGetRegisteredContentScriptsFunction::
ExtensionFunction::ResponseAction
ScriptingGetRegisteredContentScriptsFunction::Run() {
absl::optional<api::scripting::GetRegisteredContentScripts::Params> params =
std::optional<api::scripting::GetRegisteredContentScripts::Params> params =
api::scripting::GetRegisteredContentScripts::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
const absl::optional<api::scripting::ContentScriptFilter>& filter =
const std::optional<api::scripting::ContentScriptFilter>& filter =
params->filter;
std::set<std::string> id_filter;
if (filter && filter->ids) {
@ -1157,7 +1157,7 @@ ScriptingUnregisterContentScriptsFunction::Run() {
api::scripting::UnregisterContentScripts::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
absl::optional<api::scripting::ContentScriptFilter>& filter = params->filter;
std::optional<api::scripting::ContentScriptFilter>& filter = params->filter;
ExtensionUserScriptLoader* loader =
ExtensionSystem::Get(browser_context())
->user_script_manager()
@ -1206,7 +1206,7 @@ ScriptingUnregisterContentScriptsFunction::Run() {
}
void ScriptingUnregisterContentScriptsFunction::OnContentScriptsUnregistered(
const absl::optional<std::string>& error) {
const std::optional<std::string>& error) {
if (error.has_value())
Respond(Error(std::move(*error)));
else
@ -1220,7 +1220,7 @@ ScriptingUpdateContentScriptsFunction::
ExtensionFunction::ResponseAction
ScriptingRegisterContentScriptsFunction::Run() {
absl::optional<api::scripting::RegisterContentScripts::Params> params =
std::optional<api::scripting::RegisterContentScripts::Params> params =
api::scripting::RegisterContentScripts::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
@ -1341,7 +1341,7 @@ void ScriptingUpdateContentScriptsFunction::OnContentScriptFilesValidated(
}
void ScriptingUpdateContentScriptsFunction::OnContentScriptsUpdated(
const absl::optional<std::string>& error) {
const std::optional<std::string>& error) {
if (error.has_value())
Respond(Error(std::move(*error)));
else