Commit aef953bd authored by Ella Ge's avatar Ella Ge Committed by Chromium LUCI CQ

Convert c/b/ui/webui/chromeos/ from base::Bind to Once/Repeating

Bug: 1152282
Change-Id: If950c0bcb76c5dbd280ca984a8955076764daadd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601060Reviewed-by: default avatarAchuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839072}
parent ef8c591e
......@@ -41,7 +41,7 @@ void CryptohomeWebUIHandler::OnPageLoaded(const base::ListValue* args) {
GetCryptohomeBoolCallback("pkcs11-is-tpm-token-ready"));
content::GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult(
FROM_HERE, base::BindOnce(&crypto::IsTPMTokenReady, base::Closure()),
FROM_HERE, base::BindOnce(&crypto::IsTPMTokenReady, base::OnceClosure()),
base::BindOnce(&CryptohomeWebUIHandler::DidGetNSSUtilInfoOnUIThread,
weak_ptr_factory_.GetWeakPtr()));
}
......
......@@ -1037,21 +1037,21 @@ void GaiaScreenHandler::OnDnsCleared() {
}
void GaiaScreenHandler::StartClearingCookies(
const base::Closure& on_clear_callback) {
base::OnceClosure on_clear_callback) {
cookies_cleared_ = false;
ProfileHelper* profile_helper = ProfileHelper::Get();
LOG_ASSERT(Profile::FromWebUI(web_ui()) ==
profile_helper->GetSigninProfile());
profile_helper->ClearSigninProfile(
base::Bind(&GaiaScreenHandler::OnCookiesCleared,
weak_factory_.GetWeakPtr(), on_clear_callback));
base::AdaptCallbackForRepeating(base::BindOnce(
&GaiaScreenHandler::OnCookiesCleared, weak_factory_.GetWeakPtr(),
std::move(on_clear_callback))));
}
void GaiaScreenHandler::OnCookiesCleared(
const base::Closure& on_clear_callback) {
void GaiaScreenHandler::OnCookiesCleared(base::OnceClosure on_clear_callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
cookies_cleared_ = true;
on_clear_callback.Run();
std::move(on_clear_callback).Run();
}
void GaiaScreenHandler::SubmitLoginFormForTest() {
......@@ -1129,8 +1129,8 @@ void GaiaScreenHandler::LoadGaiaAsync(const AccountId& account_id) {
ShowGaiaScreenIfReady();
} else {
StartClearingDnsCache();
StartClearingCookies(base::Bind(&GaiaScreenHandler::ShowGaiaScreenIfReady,
weak_factory_.GetWeakPtr()));
StartClearingCookies(base::BindOnce(
&GaiaScreenHandler::ShowGaiaScreenIfReady, weak_factory_.GetWeakPtr()));
}
}
......
......@@ -245,8 +245,8 @@ class GaiaScreenHandler : public BaseScreenHandler,
const SamlPasswordAttributes& password_attributes);
// Kick off cookie / local storage cleanup.
void StartClearingCookies(const base::Closure& on_clear_callback);
void OnCookiesCleared(const base::Closure& on_clear_callback);
void StartClearingCookies(base::OnceClosure on_clear_callback);
void OnCookiesCleared(base::OnceClosure on_clear_callback);
// Kick off DNS cache flushing.
void StartClearingDnsCache();
......
......@@ -140,19 +140,19 @@ const char kSourceAccountPicker[] = "account-picker";
class CallOnReturn {
public:
explicit CallOnReturn(const base::Closure& callback)
: callback_(callback), call_scheduled_(false) {}
explicit CallOnReturn(base::OnceClosure callback)
: callback_(std::move(callback)), call_scheduled_(false) {}
~CallOnReturn() {
if (call_scheduled_ && !callback_.is_null())
callback_.Run();
std::move(callback_).Run();
}
void CancelScheduledCall() { call_scheduled_ = false; }
void ScheduleCall() { call_scheduled_ = true; }
private:
base::Closure callback_;
base::OnceClosure callback_;
bool call_scheduled_;
DISALLOW_COPY_AND_ASSIGN(CallOnReturn);
......@@ -586,8 +586,8 @@ void SigninScreenHandler::UpdateStateInternal(NetworkError::ErrorReason reason,
(state == NetworkStateInformer::PROXY_AUTH_REQUIRED) &&
(proxy_auth_dialog_reload_times_ > 0);
CallOnReturn reload_gaia(base::Bind(
&SigninScreenHandler::ReloadGaia, weak_factory_.GetWeakPtr(), true));
CallOnReturn reload_gaia(base::BindOnce(&SigninScreenHandler::ReloadGaia,
weak_factory_.GetWeakPtr(), true));
if (is_online || !is_behind_captive_portal)
error_screen_->HideCaptivePortal();
......
......@@ -27,8 +27,8 @@ UpdateScreenHandler::UpdateScreenHandler(JSCallsContainer* js_calls_container)
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
CHECK(accessibility_manager);
accessibility_subscription_ = accessibility_manager->RegisterCallback(
base::Bind(&UpdateScreenHandler::OnAccessibilityStatusChanged,
base::Unretained(this)));
base::BindRepeating(&UpdateScreenHandler::OnAccessibilityStatusChanged,
base::Unretained(this)));
}
UpdateScreenHandler::~UpdateScreenHandler() {
......
......@@ -54,8 +54,8 @@ WelcomeScreenHandler::WelcomeScreenHandler(JSCallsContainer* js_calls_container,
AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
CHECK(accessibility_manager);
accessibility_subscription_ = accessibility_manager->RegisterCallback(
base::Bind(&WelcomeScreenHandler::OnAccessibilityStatusChanged,
base::Unretained(this)));
base::BindRepeating(&WelcomeScreenHandler::OnAccessibilityStatusChanged,
base::Unretained(this)));
}
WelcomeScreenHandler::~WelcomeScreenHandler() {
......
......@@ -103,9 +103,9 @@ void SlowHandler::RegisterMessages() {
user_pref_registrar_ = std::make_unique<PrefChangeRegistrar>();
user_pref_registrar_->Init(profile_->GetPrefs());
user_pref_registrar_->Add(prefs::kPerformanceTracingEnabled,
base::Bind(&SlowHandler::UpdatePage,
base::Unretained(this)));
user_pref_registrar_->Add(
prefs::kPerformanceTracingEnabled,
base::BindRepeating(&SlowHandler::UpdatePage, base::Unretained(this)));
}
void SlowHandler::HandleDisable(const base::ListValue* args) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment