| Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
|
| diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
|
| index 356afd1160726f00f7269ee98515972343655204..29bad75539dc16726eedb3db8ad2e56fea67b739 100644
|
| --- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
|
| +++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc
|
| @@ -24,8 +24,6 @@
|
| #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"
|
|
|
| @@ -149,16 +147,6 @@ void AshKeyboardControllerProxy::ShowKeyboardContainer(
|
| 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.
|
|
|