Commit 13665f89 authored by David Bokan's avatar David Bokan Committed by Chromium LUCI CQ

Convert VirtualKeyboardDelegate to OnceCallback

Both overrides of GetKeyboardConfig only ever call this method once and
the chrome/ version already runs it with std::move.

Bug: 1152268
Change-Id: I23861fd1945f62654bb0692492f61e73e94ab0ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601517Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Commit-Queue: David Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839179}
parent 3d297378
...@@ -180,7 +180,7 @@ void ChromeVirtualKeyboardDelegate::GetKeyboardConfig( ...@@ -180,7 +180,7 @@ void ChromeVirtualKeyboardDelegate::GetKeyboardConfig(
void ChromeVirtualKeyboardDelegate::OnKeyboardConfigChanged() { void ChromeVirtualKeyboardDelegate::OnKeyboardConfigChanged() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
GetKeyboardConfig(base::Bind( GetKeyboardConfig(base::BindOnce(
&ChromeVirtualKeyboardDelegate::DispatchConfigChangeEvent, weak_this_)); &ChromeVirtualKeyboardDelegate::DispatchConfigChangeEvent, weak_this_));
} }
......
...@@ -24,7 +24,7 @@ class VirtualKeyboardDelegate { ...@@ -24,7 +24,7 @@ class VirtualKeyboardDelegate {
virtual ~VirtualKeyboardDelegate() {} virtual ~VirtualKeyboardDelegate() {}
using OnKeyboardSettingsCallback = using OnKeyboardSettingsCallback =
base::Callback<void(std::unique_ptr<base::DictionaryValue> settings)>; base::OnceCallback<void(std::unique_ptr<base::DictionaryValue> settings)>;
using OnSetModeCallback = base::OnceCallback<void(bool success)>; using OnSetModeCallback = base::OnceCallback<void(bool success)>;
......
...@@ -115,7 +115,7 @@ VirtualKeyboardPrivateKeyboardLoadedFunction::Run() { ...@@ -115,7 +115,7 @@ VirtualKeyboardPrivateKeyboardLoadedFunction::Run() {
ExtensionFunction::ResponseAction ExtensionFunction::ResponseAction
VirtualKeyboardPrivateGetKeyboardConfigFunction::Run() { VirtualKeyboardPrivateGetKeyboardConfigFunction::Run() {
delegate()->GetKeyboardConfig(base::Bind( delegate()->GetKeyboardConfig(base::BindOnce(
&VirtualKeyboardPrivateGetKeyboardConfigFunction::OnKeyboardConfig, &VirtualKeyboardPrivateGetKeyboardConfigFunction::OnKeyboardConfig,
this)); this));
return RespondLater(); return RespondLater();
......
...@@ -18,7 +18,7 @@ void ShellVirtualKeyboardDelegate::GetKeyboardConfig( ...@@ -18,7 +18,7 @@ void ShellVirtualKeyboardDelegate::GetKeyboardConfig(
OnKeyboardSettingsCallback on_settings_callback) { OnKeyboardSettingsCallback on_settings_callback) {
std::unique_ptr<base::DictionaryValue> settings(new base::DictionaryValue()); std::unique_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
settings->SetBoolean("hotrodmode", is_hotrod_keyboard_); settings->SetBoolean("hotrodmode", is_hotrod_keyboard_);
on_settings_callback.Run(std::move(settings)); std::move(on_settings_callback).Run(std::move(settings));
} }
void ShellVirtualKeyboardDelegate::OnKeyboardConfigChanged() { void ShellVirtualKeyboardDelegate::OnKeyboardConfigChanged() {
......
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