Ensure caret in workarea after virtual keyboard IME change.

ui/keyboard/keyboard_controller.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/keyboard/keyboard_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 221 matching lines @@
   if (ui_->HasKeyboardWindow() && ui_->GetKeyboardWindow()->IsVisible()) {
     for (KeyboardControllerObserver& observer : observer_list_)
       observer.OnKeyboardBoundsChanging(new_bounds);
     if (keyboard::IsKeyboardOverscrollEnabled())
       ui_->InitInsets(new_bounds);
     else
       ui_->ResetInsets();
   } else {
     current_keyboard_bounds_ = gfx::Rect();
   }
+  ui_->EnsureCaretInWorkArea();
 }
 
 void KeyboardController::HideKeyboard(HideReason reason) {
   keyboard_visible_ = false;
   ToggleTouchEventLogging(true);
 
   keyboard::LogKeyboardControlEvent(
       reason == HIDE_REASON_AUTOMATIC ?
           keyboard::KEYBOARD_CONTROL_HIDE_AUTO :
           keyboard::KEYBOARD_CONTROL_HIDE_USER);
@@ skipping 245 matching lines @@
 }
 
 bool KeyboardController::WillHideKeyboard() const {
   return weak_factory_.HasWeakPtrs();
 }
 
 void KeyboardController::ShowAnimationFinished() {
   // Notify observers after animation finished to prevent reveal desktop
   // background during animation.
   NotifyKeyboardBoundsChanging(container_->bounds());
-  ui_->EnsureCaretInWorkArea();
 }
 
 void KeyboardController::HideAnimationFinished() {
   ui_->HideKeyboardContainer(container_.get());
   for (KeyboardControllerObserver& observer : observer_list_)
     observer.OnKeyboardHidden();
 }
 
 void KeyboardController::AdjustKeyboardBounds() {
   // When keyboard is floating, no resize is necessary.
   if (keyboard_mode_ == FLOATING)
     return;
 
   if (keyboard_mode_ == FULL_WIDTH) {
     // TODO(bshe): revisit this logic after we decide to support resize virtual
     // keyboard.
     int keyboard_height = GetContainerWindow()->bounds().height();
     const gfx::Rect& root_bounds = container_->GetRootWindow()->bounds();
     gfx::Rect new_bounds = root_bounds;
     new_bounds.set_y(root_bounds.height() - keyboard_height);
     new_bounds.set_height(keyboard_height);
     GetContainerWindow()->SetBounds(new_bounds);
   }
 }
 
 }  // namespace keyboard