Do not move the on-screen keyboard to another display after loading an IME.

ui/keyboard/keyboard_layout_manager.cc

 // Copyright 2014 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_layout_manager.h"
 
 #include "ui/compositor/layer_animator.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace keyboard {
 
 // Overridden from aura::LayoutManager
 void KeyboardLayoutManager::OnWindowResized() {
   if (keyboard_) {
     // Container window is the top level window of the virtual keyboard window.
     // To support window.moveTo for the virtual keyboard window, as it actually
@@ skipping 56 matching lines @@
     animator->StopAnimating();
 
   controller_->GetContainerWindow()->SetBounds(new_bounds);
   SetChildBoundsDirect(keyboard_, gfx::Rect(new_bounds.size()));
 
   if (old_bounds.height() == 0 && child->bounds().height() != 0 &&
       controller_->show_on_resize()) {
     // The window height is set to 0 initially or before switch to an IME in a
     // different extension. Virtual keyboard window may wait for this bounds
     // change to correctly animate in.
-    controller_->ShowKeyboard(controller_->keyboard_locked());
+    if (controller_->keyboard_locked()) {
+      // Do not move the keyboard to another display after loading an IME.

[bshe, 2016/12/14 16:18:28]

nit: loading an IME/switch to an IME in a different extension.

[yhanada, 2016/12/15 01:10:20]

Done.

+      const int64_t display_id =
+          display::Screen::GetScreen()
+              ->GetDisplayNearestWindow(controller_->GetContainerWindow())
+              .id();
+      controller_->ShowKeyboardInDisplay(display_id);
+    } else {
+      controller_->ShowKeyboard(false /* lock */);
+    }
   } else {
     if (controller_->keyboard_mode() == FULL_WIDTH) {
       // We need to send out this notification only if keyboard is visible since
       // keyboard window is resized even if keyboard is hidden.
       if (controller_->keyboard_visible())
         controller_->NotifyKeyboardBoundsChanging(requested_bounds);
     } else if (controller_->keyboard_mode() == FLOATING) {
       controller_->NotifyKeyboardBoundsChanging(gfx::Rect());
     }
   }
 }
 
 }  // namespace keyboard