Fix calculation of usable area of screen when VK is shown.

ui/keyboard/keyboard_controller_proxy.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_proxy.h"
 
 #include "base/command_line.h"
 #include "base/values.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/bindings_policy.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
+#include "ui/base/ime/input_method.h"
+#include "ui/base/ime/text_input_client.h"
 #include "ui/keyboard/keyboard_constants.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace {
 
 // The WebContentsDelegate for the keyboard.
 // The delegate deletes itself when the keyboard is destroyed.
 class KeyboardContentsDelegate : public content::WebContentsDelegate,
                                  public content::WebContentsObserver {
@@ skipping 107 matching lines @@
 
 void KeyboardControllerProxy::HideKeyboardContainer(aura::Window* container) {
   container->Hide();
   GetKeyboardWindow()->Hide();
 }
 
 void KeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) {
 }
 
 void KeyboardControllerProxy::EnsureCaretInWorkArea() {
+  if (GetInputMethod()->GetTextInputClient()) {
+    aura::Window* keyboard_window = GetKeyboardWindow();
+    aura::Window* root_window = keyboard_window->GetRootWindow();
+    gfx::Rect available_bounds = root_window->bounds();
+    gfx::Rect keyboard_bounds = keyboard_window->bounds();
+    available_bounds.set_height(available_bounds.height() -
+        keyboard_bounds.height());
+    GetInputMethod()->GetTextInputClient()->EnsureCaretInRect(available_bounds);
+  }
 }
 
 void KeyboardControllerProxy::LoadSystemKeyboard() {
   DCHECK(keyboard_contents_);
   if (keyboard_contents_->GetURL() != default_url_) {
     // TODO(bshe): The height of system virtual keyboard and IME virtual
     // keyboard may different. The height needs to be restored too.
     LoadContents(default_url_);
   }
 }
 
 void KeyboardControllerProxy::ReloadKeyboardIfNeeded() {
   DCHECK(keyboard_contents_);
   if (keyboard_contents_->GetURL() != GetVirtualKeyboardUrl()) {
     LoadContents(GetVirtualKeyboardUrl());
   }
 }
 
 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) {
 }
 
 }  // namespace keyboard