chore: replace absl::optional<T> with std::optional<T> (#40928)
* chore: replace absl::optional<T> with std::optional<T> * IWYU
This commit is contained in:
parent
fac964ac0d
commit
892c9d78a3
129 changed files with 419 additions and 397 deletions
|
@ -53,7 +53,7 @@ PdfViewerPrivateIsAllowedLocalFileAccessFunction::
|
|||
|
||||
ExtensionFunction::ResponseAction
|
||||
PdfViewerPrivateIsAllowedLocalFileAccessFunction::Run() {
|
||||
absl::optional<IsAllowedLocalFileAccess::Params> params =
|
||||
std::optional<IsAllowedLocalFileAccess::Params> params =
|
||||
IsAllowedLocalFileAccess::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -81,7 +81,7 @@ PdfViewerPrivateSetPdfOcrPrefFunction::
|
|||
|
||||
// TODO(codebytere): enable when https://crbug.com/1393069 works properly.
|
||||
ExtensionFunction::ResponseAction PdfViewerPrivateSetPdfOcrPrefFunction::Run() {
|
||||
absl::optional<SetPdfOcrPref::Params> params =
|
||||
std::optional<SetPdfOcrPref::Params> params =
|
||||
SetPdfOcrPref::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
return RespondNow(WithArguments(false));
|
||||
|
|
|
@ -40,7 +40,7 @@ ResourcesPrivateGetStringsFunction::~ResourcesPrivateGetStringsFunction() =
|
|||
default;
|
||||
|
||||
ExtensionFunction::ResponseAction ResourcesPrivateGetStringsFunction::Run() {
|
||||
absl::optional<get_strings::Params> params(
|
||||
std::optional<get_strings::Params> params(
|
||||
get_strings::Params::Create(args()));
|
||||
base::Value::Dict dict;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#define ELECTRON_SHELL_BROWSER_EXTENSIONS_API_SCRIPTING_SCRIPTING_API_H_
|
||||
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
@ -16,7 +17,6 @@
|
|||
#include "extensions/browser/script_executor.h"
|
||||
#include "extensions/common/mojom/code_injection.mojom.h"
|
||||
#include "extensions/common/user_script.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
|
@ -49,7 +49,7 @@ class ScriptingExecuteScriptFunction : public ExtensionFunction {
|
|||
|
||||
// Called when the resource files to be injected has been loaded.
|
||||
void DidLoadResources(std::vector<InjectedFileSource> file_sources,
|
||||
absl::optional<std::string> load_error);
|
||||
std::optional<std::string> load_error);
|
||||
|
||||
// Triggers the execution of `sources` in the appropriate context.
|
||||
// Returns true on success; on failure, populates `error`.
|
||||
|
@ -78,7 +78,7 @@ class ScriptingInsertCSSFunction : public ExtensionFunction {
|
|||
|
||||
// Called when the resource files to be injected has been loaded.
|
||||
void DidLoadResources(std::vector<InjectedFileSource> file_sources,
|
||||
absl::optional<std::string> load_error);
|
||||
std::optional<std::string> load_error);
|
||||
|
||||
// Triggers the execution of `sources` in the appropriate context.
|
||||
// Returns true on success; on failure, populates `error`.
|
||||
|
@ -132,7 +132,7 @@ class ScriptingRegisterContentScriptsFunction : public ExtensionFunction {
|
|||
scripting::ValidateScriptsResult result);
|
||||
|
||||
// Called when content scripts have been registered.
|
||||
void OnContentScriptsRegistered(const absl::optional<std::string>& error);
|
||||
void OnContentScriptsRegistered(const std::optional<std::string>& error);
|
||||
};
|
||||
|
||||
class ScriptingGetRegisteredContentScriptsFunction : public ExtensionFunction {
|
||||
|
@ -171,7 +171,7 @@ class ScriptingUnregisterContentScriptsFunction : public ExtensionFunction {
|
|||
~ScriptingUnregisterContentScriptsFunction() override;
|
||||
|
||||
// Called when content scripts have been unregistered.
|
||||
void OnContentScriptsUnregistered(const absl::optional<std::string>& error);
|
||||
void OnContentScriptsUnregistered(const std::optional<std::string>& error);
|
||||
};
|
||||
|
||||
class ScriptingUpdateContentScriptsFunction : public ExtensionFunction {
|
||||
|
@ -197,7 +197,7 @@ class ScriptingUpdateContentScriptsFunction : public ExtensionFunction {
|
|||
scripting::ValidateScriptsResult result);
|
||||
|
||||
// Called when content scripts have been updated.
|
||||
void OnContentScriptsUpdated(const absl::optional<std::string>& error);
|
||||
void OnContentScriptsUpdated(const std::optional<std::string>& error);
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
|
|
|
@ -71,7 +71,7 @@ void ZoomModeToZoomSettings(WebContentsZoomController::ZoomMode zoom_mode,
|
|||
// Returns true if either |boolean| is disengaged, or if |boolean| and
|
||||
// |value| are equal. This function is used to check if a tab's parameters match
|
||||
// those of the browser.
|
||||
bool MatchesBool(const absl::optional<bool>& boolean, bool value) {
|
||||
bool MatchesBool(const std::optional<bool>& boolean, bool value) {
|
||||
return !boolean || *boolean == value;
|
||||
}
|
||||
|
||||
|
@ -210,7 +210,7 @@ bool TabsExecuteScriptFunction::ShouldRemoveCSS() const {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsReloadFunction::Run() {
|
||||
absl::optional<tabs::Reload::Params> params =
|
||||
std::optional<tabs::Reload::Params> params =
|
||||
tabs::Reload::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -233,7 +233,7 @@ ExtensionFunction::ResponseAction TabsReloadFunction::Run() {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsQueryFunction::Run() {
|
||||
absl::optional<tabs::Query::Params> params =
|
||||
std::optional<tabs::Query::Params> params =
|
||||
tabs::Query::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -255,8 +255,8 @@ ExtensionFunction::ResponseAction TabsQueryFunction::Run() {
|
|||
}
|
||||
|
||||
std::string title = params->query_info.title.value_or(std::string());
|
||||
absl::optional<bool> audible = params->query_info.audible;
|
||||
absl::optional<bool> muted = params->query_info.muted;
|
||||
std::optional<bool> audible = params->query_info.audible;
|
||||
std::optional<bool> muted = params->query_info.muted;
|
||||
|
||||
base::Value::List result;
|
||||
|
||||
|
@ -321,7 +321,7 @@ ExtensionFunction::ResponseAction TabsQueryFunction::Run() {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsGetFunction::Run() {
|
||||
absl::optional<tabs::Get::Params> params = tabs::Get::Params::Create(args());
|
||||
std::optional<tabs::Get::Params> params = tabs::Get::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
int tab_id = params->tab_id;
|
||||
|
||||
|
@ -349,7 +349,7 @@ ExtensionFunction::ResponseAction TabsGetFunction::Run() {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsSetZoomFunction::Run() {
|
||||
absl::optional<tabs::SetZoom::Params> params =
|
||||
std::optional<tabs::SetZoom::Params> params =
|
||||
tabs::SetZoom::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -377,7 +377,7 @@ ExtensionFunction::ResponseAction TabsSetZoomFunction::Run() {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsGetZoomFunction::Run() {
|
||||
absl::optional<tabs::GetZoomSettings::Params> params =
|
||||
std::optional<tabs::GetZoomSettings::Params> params =
|
||||
tabs::GetZoomSettings::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -393,7 +393,7 @@ ExtensionFunction::ResponseAction TabsGetZoomFunction::Run() {
|
|||
}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() {
|
||||
absl::optional<tabs::GetZoomSettings::Params> params =
|
||||
std::optional<tabs::GetZoomSettings::Params> params =
|
||||
tabs::GetZoomSettings::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -417,7 +417,7 @@ ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() {
|
|||
ExtensionFunction::ResponseAction TabsSetZoomSettingsFunction::Run() {
|
||||
using tabs::ZoomSettings;
|
||||
|
||||
absl::optional<tabs::SetZoomSettings::Params> params =
|
||||
std::optional<tabs::SetZoomSettings::Params> params =
|
||||
tabs::SetZoomSettings::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
@ -588,7 +588,7 @@ base::expected<GURL, std::string> PrepareURLForNavigation(
|
|||
TabsUpdateFunction::TabsUpdateFunction() : web_contents_(nullptr) {}
|
||||
|
||||
ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
|
||||
absl::optional<tabs::Update::Params> params =
|
||||
std::optional<tabs::Update::Params> params =
|
||||
tabs::Update::Params::Create(args());
|
||||
EXTENSION_FUNCTION_VALIDATE(params);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue