summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-09-29 16:16:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-09 10:04:06 +0000
commita95a7417ad456115a1ef2da4bb8320531c0821f1 (patch)
treeedcd59279e486d2fd4a8f88a7ed025bcf925c6e6 /chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
parent33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (diff)
BASELINE: Update Chromium to 106.0.5249.126
Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc')
-rw-r--r--chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc33
1 files changed, 15 insertions, 18 deletions
diff --git a/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
index 44b93f0c6c1..31f10b952e7 100644
--- a/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
+++ b/chromium/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
@@ -35,17 +35,17 @@ namespace {
// ExtensionStatusesHandler and FileMetadataHandler.
void ConvertExtensionStatusToDictionary(
const base::WeakPtr<extensions::ExtensionService>& extension_service,
- base::OnceCallback<void(const base::ListValue&)> callback,
+ base::OnceCallback<void(const base::Value::List)> callback,
const std::map<GURL, std::string>& status_map) {
if (!extension_service) {
- std::move(callback).Run(base::ListValue());
+ std::move(callback).Run(base::Value::List());
return;
}
extensions::ExtensionRegistry* extension_registry =
extensions::ExtensionRegistry::Get(extension_service->profile());
- base::ListValue list;
+ base::Value::List list;
for (auto itr = status_map.begin(); itr != status_map.end(); ++itr) {
std::string extension_id = itr->first.HostNoBrackets();
@@ -60,10 +60,10 @@ void ConvertExtensionStatusToDictionary(
dict.Set("extensionID", extension_id);
dict.Set("extensionName", extension->name());
dict.Set("status", itr->second);
- list.GetList().Append(std::move(dict));
+ list.Append(std::move(dict));
}
- std::move(callback).Run(list);
+ std::move(callback).Run(std::move(list));
}
} // namespace
@@ -74,7 +74,7 @@ ExtensionStatusesHandler::ExtensionStatusesHandler(Profile* profile)
ExtensionStatusesHandler::~ExtensionStatusesHandler() {}
void ExtensionStatusesHandler::RegisterMessages() {
- web_ui()->RegisterDeprecatedMessageCallback(
+ web_ui()->RegisterMessageCallback(
"getExtensionStatuses",
base::BindRepeating(&ExtensionStatusesHandler::HandleGetExtensionStatuses,
base::Unretained(this)));
@@ -83,20 +83,20 @@ void ExtensionStatusesHandler::RegisterMessages() {
// static
void ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
Profile* profile,
- base::OnceCallback<void(const base::ListValue&)> callback) {
+ base::OnceCallback<void(const base::Value::List)> callback) {
DCHECK(profile);
sync_file_system::SyncFileSystemService* sync_service =
SyncFileSystemServiceFactory::GetForProfile(profile);
if (!sync_service) {
- std::move(callback).Run(base::ListValue());
+ std::move(callback).Run(base::Value::List());
return;
}
extensions::ExtensionService* extension_service =
extensions::ExtensionSystem::Get(profile)->extension_service();
if (!extension_service) {
- std::move(callback).Run(base::ListValue());
+ std::move(callback).Run(base::Value::List());
return;
}
@@ -106,20 +106,17 @@ void ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
}
void ExtensionStatusesHandler::HandleGetExtensionStatuses(
- const base::ListValue* args) {
+ const base::Value::List& args) {
AllowJavascript();
- DCHECK(args);
GetExtensionStatusesAsDictionary(
profile_,
- base::BindOnce(
- &ExtensionStatusesHandler::DidGetExtensionStatuses,
- weak_ptr_factory_.GetWeakPtr(),
- args->GetListDeprecated()[0].GetString() /* callback_id */));
+ base::BindOnce(&ExtensionStatusesHandler::DidGetExtensionStatuses,
+ weak_ptr_factory_.GetWeakPtr(),
+ args[0].GetString() /* callback_id */));
}
-void ExtensionStatusesHandler::DidGetExtensionStatuses(
- std::string callback_id,
- const base::ListValue& list) {
+void ExtensionStatusesHandler::DidGetExtensionStatuses(std::string callback_id,
+ base::Value::List list) {
ResolveJavascriptCallback(base::Value(callback_id), list);
}