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

ui/keyboard/keyboard_controller.cc

 // Copyright (c) 2013 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_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 257 matching lines @@
 }
 
 void KeyboardController::AddObserver(KeyboardControllerObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 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.

 }
 
 void KeyboardController::OnWindowHierarchyChanged(
     const HierarchyChangeParams& params) {
   if (params.new_parent && params.target == container_.get())
     OnTextInputStateChanged(proxy_->GetInputMethod()->GetTextInputClient());
 }
 
 void KeyboardController::Reload() {
   // Makes sure the keyboard window is initialized.
@@ skipping 52 matching lines @@
   if (container_->children().empty()) {
     keyboard::MarkKeyboardLoadStarted();
     aura::Window* keyboard = proxy_->GetKeyboardWindow();
     keyboard->Show();
     container_->AddChild(keyboard);
     keyboard->set_owned_by_parent(false);
   }
 
   proxy_->ReloadKeyboardIfNeeded();
 
-  if (keyboard_visible_)
+  if (keyboard_visible_ || proxy_->GetKeyboardWindow()->bounds().height() == 0)
     return;
 
   keyboard_visible_ = true;
 
   // If the controller is in the process of hiding the keyboard, do not log
   // the stat here since the keyboard will not actually be shown.
   if (!WillHideKeyboard())
     keyboard::LogKeyboardControlEvent(keyboard::KEYBOARD_CONTROL_SHOW);
 
   weak_factory_.InvalidateWeakPtrs();
 
   // If |container_| has hide animation, its visibility is set to false when
   // hide animation finished. So even if the container is visible at this
   // point, it may in the process of hiding. We still need to show keyboard
   // container in this case.
   if (container_->IsVisible() &&
       !container_->layer()->GetAnimator()->is_animating())
     return;
 
-  ShowKeyboard();
+  ShowKeyboardInternal();
 }
 
-void KeyboardController::ShowKeyboard() {
+void KeyboardController::ShowKeyboardInternal() {
   ToggleTouchEventLogging(false);
   ui::LayerAnimator* container_animator = container_->layer()->GetAnimator();
 
   // If the container is not animating, makes sure the position and opacity
   // are at begin states for animation.
   if (!container_animator->is_animating()) {
     gfx::Transform transform;
     transform.Translate(0, proxy_->GetKeyboardWindow()->bounds().height());
     container_->SetTransform(transform);
     container_->layer()->SetOpacity(kAnimationStartOrAfterHideOpacity);
@@ skipping 32 matching lines @@
   // background during animation.
   NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds());
   proxy_->EnsureCaretInWorkArea();
 }
 
 void KeyboardController::HideAnimationFinished() {
   proxy_->HideKeyboardContainer(container_.get());
 }
 
 }  // namespace keyboard