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

chrome/browser/ui/ash/ash_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 "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/api/virtual_keyboard_private.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/base/ime/input_method.h"
-#include "ui/base/ime/text_input_client.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/keyboard/keyboard_controller.h"
 
 namespace virtual_keyboard_private = extensions::api::virtual_keyboard_private;
 typedef virtual_keyboard_private::OnTextInputBoxFocused::Context Context;
 
 namespace {
 
 const char* kVirtualKeyboardExtensionID = "mppnpdlheglhdfmldimlhpnegondlapf";
 
@@ skipping 103 matching lines @@
 void AshKeyboardControllerProxy::ShowKeyboardContainer(
     aura::Window* container) {
   // TODO(bshe): Implement logic to decide which root window should display
   // virtual keyboard. http://crbug.com/303429
   if (container->GetRootWindow() != ash::Shell::GetPrimaryRootWindow())
     NOTIMPLEMENTED();
 
   KeyboardControllerProxy::ShowKeyboardContainer(container);
 }
 
-void AshKeyboardControllerProxy::EnsureCaretInWorkArea() {
-  // GetTextInputClient may return NULL when keyboard-usability-experiment
-  // flag is set.
-  if (GetInputMethod()->GetTextInputClient()) {
-    gfx::Rect showing_area =
-        ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
-    GetInputMethod()->GetTextInputClient()->EnsureCaretInRect(showing_area);
-  }
-}
-
 void AshKeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) {
   // TODO(bshe): Need to check the affected window's profile once multi-profile
   // is supported.
   content::BrowserContext* context = GetBrowserContext();
   extensions::EventRouter* router = extensions::EventRouter::Get(context);
 
   if (!router->HasEventListener(
           virtual_keyboard_private::OnTextInputBoxFocused::kEventName)) {
     return;
   }
 
   scoped_ptr<base::ListValue> event_args(new base::ListValue());
   scoped_ptr<base::DictionaryValue> input_context(new base::DictionaryValue());
   input_context->SetString("type",
       Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type)));
   event_args->Append(input_context.release());
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       virtual_keyboard_private::OnTextInputBoxFocused::kEventName,
       event_args.Pass()));
   event->restrict_to_browser_context = context;
   router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass());
 }