Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / keyboard / keyboard_controller_proxy.cc

diff --git a/src/ui/keyboard/keyboard_controller_proxy.cc b/src/ui/keyboard/keyboard_controller_proxy.cc
index dec2b0f..097b0d6 100644 (file)
--- a/src/ui/keyboard/keyboard_controller_proxy.cc
+++ b/src/ui/keyboard/keyboard_controller_proxy.cc
@@ -169,6 +169,15 @@ void KeyboardControllerProxy::LoadSystemKeyboard() {
 void KeyboardControllerProxy::ReloadKeyboardIfNeeded() {
   DCHECK(keyboard_contents_);
   if (keyboard_contents_->GetURL() != GetVirtualKeyboardUrl()) {
+    if (keyboard_contents_->GetURL().GetOrigin() !=
+        GetVirtualKeyboardUrl().GetOrigin()) {
+      // Sets keyboard window height to 0 before navigate to a keyboard in a
+      // different extension. This keeps the UX the same as Android.
+      gfx::Rect bounds = GetKeyboardWindow()->bounds();
+      bounds.set_y(bounds.y() + bounds.height());
+      bounds.set_height(0);
+      GetKeyboardWindow()->SetBounds(bounds);
+    }
     LoadContents(GetVirtualKeyboardUrl());
   }
 }