Make the virtual keyboard show up on the display with input focus.

ui/keyboard/keyboard_controller.h

Index: ui/keyboard/keyboard_controller.h
diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h
index 7e59feea65ea1c5d83c431b7876eab0c2f7792b3..e123d0f597773bb1a00abe70a2f21f904e791595 100644
--- a/ui/keyboard/keyboard_controller.h
+++ b/ui/keyboard/keyboard_controller.h
@@ -15,6 +15,7 @@
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_export.h"
+#include "ui/keyboard/keyboard_layout_delegate.h"
 
 namespace aura {
 class Window;
@@ -58,7 +59,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   };
 
   // Takes ownership of |ui|.
-  explicit KeyboardController(KeyboardUI* ui);
+  explicit KeyboardController(KeyboardUI* ui, KeyboardLayoutDelegate* delegate);
   ~KeyboardController() override;
 
   // Returns the container for the keyboard, which is owned by
@@ -99,6 +100,10 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   // |lock| is true.
   void ShowKeyboard(bool lock);
 
+  // Force the keyboard to show up in the specific display if not showing and
+  // lock the keyboard
+  void ShowKeyboardInSpecificDisplay(const int64_t display_id);

[oshima, 2016/11/08 17:26:05]

...InDisplay

[yhanada, 2016/11/14 22:48:47]

Done.

+
   // Sets the active keyboard controller. KeyboardController takes ownership of
   // the instance. Calling ResetIntance with a new instance destroys the
   // previous one. May be called with NULL to clear the instance.
@@ -141,7 +146,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   void OnShowImeIfNeeded() override;
 
   // Show virtual keyboard immediately with animation.
-  void ShowKeyboardInternal();
+  void ShowKeyboardInternal(int64_t display_id);
 
   // Returns true if keyboard is scheduled to hide.
   bool WillHideKeyboard() const;
@@ -152,6 +157,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
   void HideAnimationFinished();
 
   std::unique_ptr<KeyboardUI> ui_;
+  KeyboardLayoutDelegate* layout_delegate_;
   std::unique_ptr<aura::Window> container_;
   // CallbackAnimationObserver should destructed before container_ because it
   // uses container_'s animator.