Prevent a11y on-screen keyboard from occluding active text field.

ash/wm/workspace/workspace_layout_manager.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 "ash/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "ash/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/ime/input_method.h"
+#include "ui/base/ime/text_input_client.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/gfx/screen.h"
+#include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 using aura::Window;
 
 namespace ash {
 
 WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)
     : shelf_(NULL),
       window_(window),
@@ skipping 79 matching lines @@
 void WorkspaceLayoutManager::SetChildBounds(
     Window* child,
     const gfx::Rect& requested_bounds) {
   wm::WindowState* window_state = wm::GetWindowState(child);
   wm::SetBoundsEvent event(wm::WM_EVENT_SET_BOUNDS, requested_bounds);
   window_state->OnWMEvent(&event);
   UpdateShelfVisibility();
 }
 
 //////////////////////////////////////////////////////////////////////////////
+// WorkspaceLayoutManager, keyboard::KeyboardControllerObserver implementation:
+
+void WorkspaceLayoutManager::OnKeyboardBoundsChanging(
+    const gfx::Rect& new_bounds) {
+  aura::Window* root_window = ash::Shell::GetInstance()->GetPrimaryRootWindow();

[flackr, 2014/06/02 20:24:52]

Should use the managed root window (i.e. window_->GetRootWindow())

[kevers, 2014/06/03 13:21:18]

Done.

+  ui::InputMethod* input_method =
+      root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
+  ui::TextInputClient* text_input_client = input_method->GetTextInputClient();
+  if(text_input_client) {
+    aura::Window *window = text_input_client->GetAttachedWindow();
+    if (window && window->parent() &&
+        window->parent()->layout_manager() == this) {

[flackr, 2014/06/02 20:24:52]

I think this condition can just be window_->Contains(window).

[kevers, 2014/06/03 13:21:18]

Done.

+      gfx::Rect window_bounds = window->GetBoundsInScreen();

[flackr, 2014/06/02 20:24:52]

Should this be target bounds (converted to screen coordinates of course) in case
the window is already moving?

[kevers, 2014/06/03 13:21:18]

Done.

+      gfx::Rect intersect = gfx::IntersectRects(window_bounds, new_bounds);
+      if (intersect.height() > 0) {
+        int shift = std::min(intersect.height(),
+                             window->bounds().y() - work_area_in_parent_.y());
+        if (shift != 0) {
+          gfx::Point origin(window->bounds().x(), window->bounds().y() - shift);
+          SetChildBounds(window, gfx::Rect(origin, window->bounds().size()));
+        }
+      }
+    }
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, ash::ShellObserver implementation:
 
 void WorkspaceLayoutManager::OnDisplayWorkAreaInsetsChanged() {
   const gfx::Rect work_area(ScreenUtil::ConvertRectFromScreen(
       window_,
       Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area()));
   if (work_area != work_area_in_parent_) {
     const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
     AdjustAllWindowsBoundsForWorkAreaChange(&event);
   }
@@ skipping 136 matching lines @@
   bool is_fullscreen = GetRootWindowController(
       window_->GetRootWindow())->GetWindowForFullscreenMode() != NULL;
   if (is_fullscreen != is_fullscreen_) {
     ash::Shell::GetInstance()->NotifyFullscreenStateChange(
         is_fullscreen, window_->GetRootWindow());
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 }  // namespace ash