Commit 426e08b2 authored by yhanada's avatar yhanada Committed by Commit Bot

Switch to base::BindOnce from base::Bind in KeyboardController.

Test: It builds. No behavioral change.
Change-Id: I786bc492ff79fd3220bd1974d72f0e9703a1ccc2
Reviewed-on: https://chromium-review.googlesource.com/580453Reviewed-by: default avatarKeigo Oka <oka@chromium.org>
Commit-Queue: Yuichiro Hanada <yhanada@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488606}
parent 2431d137
...@@ -241,7 +241,7 @@ namespace keyboard { ...@@ -241,7 +241,7 @@ namespace keyboard {
class CallbackAnimationObserver : public ui::LayerAnimationObserver { class CallbackAnimationObserver : public ui::LayerAnimationObserver {
public: public:
CallbackAnimationObserver(const scoped_refptr<ui::LayerAnimator>& animator, CallbackAnimationObserver(const scoped_refptr<ui::LayerAnimator>& animator,
base::Callback<void(void)> callback); base::OnceCallback<void(void)> callback);
~CallbackAnimationObserver() override; ~CallbackAnimationObserver() override;
private: private:
...@@ -251,16 +251,15 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver { ...@@ -251,16 +251,15 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver {
void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {} void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {}
scoped_refptr<ui::LayerAnimator> animator_; scoped_refptr<ui::LayerAnimator> animator_;
base::Callback<void(void)> callback_; base::OnceCallback<void(void)> callback_;
DISALLOW_COPY_AND_ASSIGN(CallbackAnimationObserver); DISALLOW_COPY_AND_ASSIGN(CallbackAnimationObserver);
}; };
CallbackAnimationObserver::CallbackAnimationObserver( CallbackAnimationObserver::CallbackAnimationObserver(
const scoped_refptr<ui::LayerAnimator>& animator, const scoped_refptr<ui::LayerAnimator>& animator,
base::Callback<void(void)> callback) base::OnceCallback<void(void)> callback)
: animator_(animator), callback_(callback) { : animator_(animator), callback_(std::move(callback)) {}
}
CallbackAnimationObserver::~CallbackAnimationObserver() { CallbackAnimationObserver::~CallbackAnimationObserver() {
animator_->RemoveObserver(this); animator_->RemoveObserver(this);
...@@ -271,7 +270,8 @@ void CallbackAnimationObserver::OnLayerAnimationEnded( ...@@ -271,7 +270,8 @@ void CallbackAnimationObserver::OnLayerAnimationEnded(
if (animator_->is_animating()) if (animator_->is_animating())
return; return;
animator_->RemoveObserver(this); animator_->RemoveObserver(this);
callback_.Run(); DCHECK(!callback_.is_null());
std::move(callback_).Run();
} }
void CallbackAnimationObserver::OnLayerAnimationAborted( void CallbackAnimationObserver::OnLayerAnimationAborted(
...@@ -435,8 +435,8 @@ void KeyboardController::HideKeyboard(HideReason reason) { ...@@ -435,8 +435,8 @@ void KeyboardController::HideKeyboard(HideReason reason) {
ui::LayerAnimator* container_animator = container_->layer()->GetAnimator(); ui::LayerAnimator* container_animator = container_->layer()->GetAnimator();
animation_observer_.reset(new CallbackAnimationObserver( animation_observer_.reset(new CallbackAnimationObserver(
container_animator, container_animator,
base::Bind(&KeyboardController::HideAnimationFinished, base::BindOnce(&KeyboardController::HideAnimationFinished,
base::Unretained(this)))); base::Unretained(this))));
container_animator->AddObserver(animation_observer_.get()); container_animator->AddObserver(animation_observer_.get());
ui::ScopedLayerAnimationSettings settings(container_animator); ui::ScopedLayerAnimationSettings settings(container_animator);
...@@ -567,9 +567,9 @@ void KeyboardController::OnTextInputStateChanged( ...@@ -567,9 +567,9 @@ void KeyboardController::OnTextInputStateChanged(
keyboard_visible_ = false; keyboard_visible_ = false;
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&KeyboardController::HideKeyboard, base::BindOnce(&KeyboardController::HideKeyboard,
weak_factory_will_hide_.GetWeakPtr(), weak_factory_will_hide_.GetWeakPtr(),
HIDE_REASON_AUTOMATIC), HIDE_REASON_AUTOMATIC),
base::TimeDelta::FromMilliseconds(kHideKeyboardDelayMs)); base::TimeDelta::FromMilliseconds(kHideKeyboardDelayMs));
if (state_ == KeyboardControllerState::LOADING_EXTENSION) { if (state_ == KeyboardControllerState::LOADING_EXTENSION) {
show_on_resize_ = false; show_on_resize_ = false;
...@@ -709,8 +709,8 @@ void KeyboardController::PopulateKeyboardContent(int64_t display_id, ...@@ -709,8 +709,8 @@ void KeyboardController::PopulateKeyboardContent(int64_t display_id,
} else { } else {
animation_observer_.reset(new CallbackAnimationObserver( animation_observer_.reset(new CallbackAnimationObserver(
container_animator, container_animator,
base::Bind(&KeyboardController::ShowAnimationFinished, base::BindOnce(&KeyboardController::ShowAnimationFinished,
base::Unretained(this)))); base::Unretained(this))));
container_animator->AddObserver(animation_observer_.get()); container_animator->AddObserver(animation_observer_.get());
} }
......
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