From 73c85410c56f0a4024fd0fd1ee6aa5360c30621a Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Wed, 22 Jun 2022 01:14:35 -0700 Subject: [PATCH] chore: modernize ListValue code in session (#34656) * chore: modernize ListValue code in session * also in browser_context --- shell/browser/api/electron_api_session.cc | 4 ++-- shell/browser/electron_browser_context.cc | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index d86e62dc7c8a..22bf54c8f14c 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -1024,7 +1024,7 @@ base::Value Session::GetSpellCheckerLanguages() { void Session::SetSpellCheckerLanguages( gin_helper::ErrorThrower thrower, const std::vector& languages) { - base::ListValue language_codes; + base::Value::List language_codes; for (const std::string& lang : languages) { std::string code = spellcheck::GetCorrespondingSpellCheckLanguage(lang); if (code.empty()) { @@ -1035,7 +1035,7 @@ void Session::SetSpellCheckerLanguages( language_codes.Append(code); } browser_context_->prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, - language_codes); + base::Value(std::move(language_codes))); // Enable spellcheck if > 0 languages, disable if no languages set browser_context_->prefs()->SetBoolean(spellcheck::prefs::kSpellCheckEnable, !languages.empty()); diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc index 66643c4731e9..2b7aa145f796 100644 --- a/shell/browser/electron_browser_context.cc +++ b/shell/browser/electron_browser_context.cc @@ -220,9 +220,10 @@ void ElectronBrowserContext::InitPrefs() { std::string default_code = spellcheck::GetCorrespondingSpellCheckLanguage( base::i18n::GetConfiguredLocale()); if (!default_code.empty()) { - base::ListValue language_codes; + base::Value::List language_codes; language_codes.Append(default_code); - prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, language_codes); + prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, + base::Value(std::move(language_codes))); } } #endif