summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authorkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-04 15:55:49 +0000
committerkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-04 15:55:49 +0000
commitee4d1a6465590102b5523f97b22f097db1907078 (patch)
tree4a2360a07ab9bc074f4e9fe6d8fbd64acd0112f7 /ash/root_window_controller.cc
parent3b149b73ec07004bf01b745bdef8680621f897fb (diff)
downloadchromium_src-ee4d1a6465590102b5523f97b22f097db1907078.zip
chromium_src-ee4d1a6465590102b5523f97b22f097db1907078.tar.gz
chromium_src-ee4d1a6465590102b5523f97b22f097db1907078.tar.bz2
Prevent a11y on-screen keyboard from occluding active text field.
Notifies the workspace layout manager when the on-screen keyboard is shown to reposition the focused window, preventing occlusion of the active text field. BUG=235811 Review URL: https://codereview.chromium.org/313463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 5a798d7..1fe7c37 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -688,6 +688,7 @@ void RootWindowController::ActivateKeyboard(
keyboard_controller->AddObserver(shelf()->shelf_layout_manager());
keyboard_controller->AddObserver(panel_layout_manager_);
keyboard_controller->AddObserver(docked_layout_manager_);
+ keyboard_controller->AddObserver(workspace_controller_->layout_manager());
Shell::GetInstance()->delegate()->VirtualKeyboardActivated(true);
}
aura::Window* parent = GetContainer(
@@ -722,6 +723,8 @@ void RootWindowController::DeactivateKeyboard(
keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager());
keyboard_controller->RemoveObserver(panel_layout_manager_);
keyboard_controller->RemoveObserver(docked_layout_manager_);
+ keyboard_controller->RemoveObserver(
+ workspace_controller_->layout_manager());
Shell::GetInstance()->delegate()->VirtualKeyboardActivated(false);
}
}