Remove native VK window height logic and wait for resizeTo to setup VK window height

ui/keyboard/keyboard_controller.cc

Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 4dd085c6e05b33fd1b3c8d3609c8a41972008867..19ba44f25664e8777e27dca2f31ad879e74aa0b7 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -275,8 +275,8 @@ void KeyboardController::RemoveObserver(KeyboardControllerObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-void KeyboardController::ShowAndLockKeyboard() {
-  set_lock_keyboard(true);
+void KeyboardController::ShowKeyboard(bool lock) {
+  set_lock_keyboard(lock);
   OnShowImeIfNeeded();

[Shu Chen, 2014/04/22 17:54:57]

From the current call paths, I think it would be better to merge most of the
code from OnShowImeIfNeeded() to ShowKeyboardInternal() and the call paths would
be:
  ShowKeyboard() -> ShowKeyboardInternal()
  OnShowImeIfNeeded() -> ShowKeyboardInternal()

[bshe, 2014/04/23 01:08:53]

Done.

 }
 
@@ -350,7 +350,7 @@ void KeyboardController::OnShowImeIfNeeded() {
 
   proxy_->ReloadKeyboardIfNeeded();
 
-  if (keyboard_visible_)
+  if (keyboard_visible_ || proxy_->GetKeyboardWindow()->bounds().height() == 0)
     return;
 
   keyboard_visible_ = true;
@@ -370,10 +370,10 @@ void KeyboardController::OnShowImeIfNeeded() {
       !container_->layer()->GetAnimator()->is_animating())
     return;
 
-  ShowKeyboard();
+  ShowKeyboardInternal();
 }
 
-void KeyboardController::ShowKeyboard() {
+void KeyboardController::ShowKeyboardInternal() {
   ToggleTouchEventLogging(false);
   ui::LayerAnimator* container_animator = container_->layer()->GetAnimator();