Chromium Code Reviews| Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc |
| diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc |
| index 84a406896219fe2cacdc1f107ae52cdebbdfaa97..9b01f065611b0fa726575725c16f136d75233caf 100644 |
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc |
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc |
| @@ -944,17 +944,19 @@ void AccessibilityManager::UpdateVirtualKeyboardFromPref() { |
| virtual_keyboard_enabled_ = enabled; |
| keyboard::SetAccessibilityKeyboardEnabled(enabled); |
| - // Note that there are two versions of the on-screen keyboard. A full layout |
| - // is provided for accessibility, which includes sticky modifier keys to |
| - // enable typing of hotkeys. A compact version is used in touchview mode |
| - // to provide a layout with larger keys to facilitate touch typing. In the |
| - // event that the a11y keyboard is being disabled, an on-screen keyboard might |
| - // still be enabled and a forced reset is required to pick up the layout |
| - // change. |
| - if (keyboard::IsKeyboardEnabled()) |
| - ash::Shell::GetInstance()->CreateKeyboard(); |
| - else |
| - ash::Shell::GetInstance()->DeactivateKeyboard(); |
| + if (!chrome::IsRunningInMash()) { |
| + // Note that there are two versions of the on-screen keyboard. A full layout |
| + // is provided for accessibility, which includes sticky modifier keys to |
| + // enable typing of hotkeys. A compact version is used in touchview mode |
| + // to provide a layout with larger keys to facilitate touch typing. In the |
| + // event that the a11y keyboard is being disabled, an on-screen keyboard |
| + // might still be enabled and a forced reset is required to pick up the |
| + // layout change. |
| + if (keyboard::IsKeyboardEnabled()) |
| + ash::Shell::GetInstance()->CreateKeyboard(); |
| + else |
| + ash::Shell::GetInstance()->DeactivateKeyboard(); |
| + } |
|
sky
2016/09/13 20:09:47
File a but for the else case and a NOTIMPLEMENTED?
msw
2016/09/13 20:36:56
Done.
|
| AccessibilityStatusEventDetails details(ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD, |
| enabled, ash::A11Y_NOTIFICATION_NONE); |