Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 2339633002: mash: Port KeyboardUIMus to mojo:ash; remove sysui. (Closed)
Patch Set: Add mash NOTIMPLEMENTED() in AccessibilityManager::UpdateVirtualKeyboardFromPref() Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/sysui/sysui_application.cc ('k') | tools/determinism/compare_build_artifacts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fda42b4d37e5589c504ee39e4518384f75b408c0 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -944,17 +944,22 @@ 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();
+ } else {
+ // TODO(mash): Support on-screen keyboard. See http://crbug.com/646565
+ NOTIMPLEMENTED();
+ }
AccessibilityStatusEventDetails details(ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD,
enabled, ash::A11Y_NOTIFICATION_NONE);
« no previous file with comments | « ash/sysui/sysui_application.cc ('k') | tools/determinism/compare_build_artifacts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698