New accessibility virtual keyboard behavior in non-sticky mode.

ui/base/ime/input_method_base.cc

 // Copyright (c) 2012 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/base/ime/input_method_base.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 45 matching lines @@
 void InputMethodBase::DetachTextInputClient(TextInputClient* client) {
   if (text_input_client_ != client)
     return;
   SetFocusedTextInputClientInternal(nullptr);
 }
 
 TextInputClient* InputMethodBase::GetTextInputClient() const {
   return text_input_client_;
 }
 
+void InputMethodBase::SetOnScreenKeyboardBounds(const gfx::Rect& new_bounds) {
+  LOG(ERROR) << "Called SetOnScreenKeyboardBounds: " << new_bounds.ToString();

[oshima, 2017/01/18 02:37:19]

nit: remove debug log

[yhanada, 2017/01/30 13:02:47]

Done.

+  keyboard_bounds_ = new_bounds;
+  if (text_input_client_)
+    text_input_client_->EnsureCaretNotInRect(keyboard_bounds_);
+}
+
 void InputMethodBase::OnTextInputTypeChanged(const TextInputClient* client) {
   if (!IsTextInputClientFocused(client))
     return;
   NotifyTextInputStateChanged(client);
 }
 
 void InputMethodBase::OnInputLocaleChanged() {
 }
 
 bool InputMethodBase::IsInputLocaleCJK() const {
@@ skipping 63 matching lines @@
 
 void InputMethodBase::NotifyTextInputCaretBoundsChanged(
     const TextInputClient* client) {
   for (InputMethodObserver& observer : observer_list_)
     observer.OnCaretBoundsChanged(client);
 }
 
 void InputMethodBase::SetFocusedTextInputClientInternal(
     TextInputClient* client) {
   TextInputClient* old = text_input_client_;
+  LOG(ERROR) << "Called SetFocusedTextInputClientInternal: old = " << old
+             << ", new = " << client;

[oshima, 2017/01/18 02:37:19]

nit: debug log

[yhanada, 2017/01/30 13:02:47]

Done.

+
   if (old == client)
     return;
   OnWillChangeFocusedClient(old, client);
   text_input_client_ = client;  // nullptr allowed.
   OnDidChangeFocusedClient(old, client);
   NotifyTextInputStateChanged(text_input_client_);
+
+  // Restore old focused window if moved.
+  if (old)
+    old->OnClientFocusLost();
+  // Move new focused window if necessary.
+  if (text_input_client_)
+    text_input_client_->EnsureCaretNotInRect(keyboard_bounds_);
 }
 
 std::vector<gfx::Rect> InputMethodBase::GetCompositionBounds(
     const TextInputClient* client) {
   std::vector<gfx::Rect> bounds;
   if (client->HasCompositionText()) {
     uint32_t i = 0;
     gfx::Rect rect;
     while (client->GetCompositionCharacterBounds(i++, &rect))
       bounds.push_back(rect);
@@ skipping 56 matching lines @@
 InputMethod* InputMethodBase::GetInputMethod() {
   return this;
 }
 
 const std::vector<std::unique_ptr<ui::KeyEvent>>&
 InputMethodBase::GetKeyEventsForTesting() {
   return key_events_for_testing_;
 }
 
 }  // namespace ui