diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 23:53:41 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 23:53:41 +0000 |
| commit | e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb (patch) | |
| tree | 15f265151d1bef6148876c906ef885d443c5823d /ash/shell.cc | |
| parent | b94661f4a8c8dcc048ccd29e34eae6b554880d99 (diff) | |
| download | chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.zip chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.tar.gz chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.tar.bz2 | |
Reland a11y keyboard.
BUG=297132
Patch set 1 is the original CL:
https://codereview.chromium.org/137543002/
which broke tests on the memory bots. Path set 2 contains the fix for the test failure.
Review URL: https://codereview.chromium.org/148213010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index d5209fb..4c298a4 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -416,6 +416,17 @@ void Shell::CreateKeyboard() { } } +void Shell::DeactivateKeyboard() { + if (keyboard_controller_.get()) { + RootWindowControllerList controllers = GetAllRootWindowControllers(); + for (RootWindowControllerList::iterator iter = controllers.begin(); + iter != controllers.end(); ++iter) { + (*iter)->DeactivateKeyboard(keyboard_controller_.get()); + } + } + keyboard_controller_.reset(); +} + void Shell::ShowShelf() { RootWindowControllerList controllers = GetAllRootWindowControllers(); for (RootWindowControllerList::iterator iter = controllers.begin(); @@ -860,8 +871,9 @@ void Shell::Init() { // The keyboard system must be initialized before the RootWindowController is // created. - if (keyboard::IsKeyboardEnabled()) +#if defined(OS_CHROMEOS) keyboard::InitializeKeyboard(); +#endif lock_state_controller_.reset(new LockStateController); power_button_controller_.reset(new PowerButtonController( |