Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 134133003: Fix VK animation related issues (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/ash_keyboard_controller_proxy_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 042c786a210bfe79a9e37a4c452bba2e878389ff..9b0b3d1d998cac105a517d8f476204808f3554b8 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -279,8 +279,14 @@ void KeyboardController::OnTextInputStateChanged(
keyboard::LogKeyboardControlEvent(keyboard::KEYBOARD_CONTROL_SHOW);
weak_factory_.InvalidateWeakPtrs();
- if (container_->IsVisible())
+ // If |container_| has hide animation, its visibility is set to false when
+ // hide animation finished. So even if the container is visible at this
+ // point, it may in the process of hiding. We still need to show keyboard
+ // container in this case.
+ if (container_->IsVisible() &&
+ !container_->layer()->GetAnimator()->is_animating()) {
return;
+ }
NotifyKeyboardBoundsChanging(container_->children()[0]->bounds());
« no previous file with comments | « chrome/browser/ui/ash/ash_keyboard_controller_proxy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698