diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-28 06:26:37 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-28 06:26:37 +0000 |
| commit | 34dcd990f6408c9731d853f25384adcd20408f0c (patch) | |
| tree | e97d5af788786b6d024e297af72a28436aa6d020 /ash/root_window_controller.cc | |
| parent | 262cb525ea6ef64ac658f217e66a47743e291648 (diff) | |
| download | chromium_src-34dcd990f6408c9731d853f25384adcd20408f0c.zip chromium_src-34dcd990f6408c9731d853f25384adcd20408f0c.tar.gz chromium_src-34dcd990f6408c9731d853f25384adcd20408f0c.tar.bz2 | |
Add a11y on-screen keyboard.
Adds an accessibility option for displaying a virtual keyboard on the login screen and on the settings page.
Followup patches required to persist the login preference on first time sign in, and to use the full virtual keyboard in place of the touch optimized version.
BUG=297132
Review URL: https://codereview.chromium.org/137543002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index b52204c8..26e9016 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -613,13 +613,10 @@ void RootWindowController::ActivateKeyboard( void RootWindowController::DeactivateKeyboard( keyboard::KeyboardController* keyboard_controller) { - if (!keyboard::IsKeyboardEnabled()) + if (!keyboard_controller || + !keyboard_controller->keyboard_container_initialized()) { return; - - DCHECK(keyboard_controller); - if (!keyboard_controller->keyboard_container_initialized()) - return; - + } aura::Window* keyboard_container = keyboard_controller->GetContainerWindow(); if (keyboard_container->GetRootWindow() == root_window()) { |