X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fkeyboard%2Fkeyboard_controller_proxy.cc;h=097b0d62f1d70b2131b7f36866460aa618137ad1;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=dec2b0f3518ac36b9b13082323217a2f319b645e;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/ui/keyboard/keyboard_controller_proxy.cc b/src/ui/keyboard/keyboard_controller_proxy.cc
index dec2b0f..097b0d6 100644
--- 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());
   }
 }