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