| 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 2785c5dcc97fc86b8b406f1be241d3937c98db64..002c7ec30f40da2d904d4c13742f8a4bc2e06fcd 100644
|
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| @@ -662,7 +662,7 @@ void AccessibilityManager::UpdateAutoclickFromPref() {
|
| return;
|
| autoclick_enabled_ = enabled;
|
|
|
| - if (ash_util::IsRunningInMash()) {
|
| + if (IsRunningInMash()) {
|
| service_manager::Connector* connector =
|
| content::ServiceManagerConnection::GetForProcess()->GetConnector();
|
| mash::mojom::LaunchablePtr launchable;
|
| @@ -699,7 +699,7 @@ void AccessibilityManager::UpdateAutoclickDelayFromPref() {
|
| return;
|
| autoclick_delay_ms_ = autoclick_delay_ms;
|
|
|
| - if (ash_util::IsRunningInMash()) {
|
| + if (IsRunningInMash()) {
|
| service_manager::Connector* connector =
|
| content::ServiceManagerConnection::GetForProcess()->GetConnector();
|
| ash::autoclick::mojom::AutoclickControllerPtr autoclick_controller;
|
| @@ -739,7 +739,7 @@ void AccessibilityManager::UpdateVirtualKeyboardFromPref() {
|
| virtual_keyboard_enabled_ = enabled;
|
|
|
| keyboard::SetAccessibilityKeyboardEnabled(enabled);
|
| - if (!ash_util::IsRunningInMash()) {
|
| + if (!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
|
| @@ -1022,7 +1022,7 @@ void AccessibilityManager::InputMethodChanged(
|
| bool show_message) {
|
| // Sticky keys is implemented only in ash.
|
| // TODO(dpolukhin): support Athena, crbug.com/408733.
|
| - if (!ash_util::IsRunningInMash()) {
|
| + if (!IsRunningInMash()) {
|
| ash::Shell::GetInstance()->sticky_keys_controller()->SetModifiersEnabled(
|
| manager->IsISOLevel5ShiftUsedByCurrentInputMethod(),
|
| manager->IsAltGrUsedByCurrentInputMethod());
|
|
|