OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
6 | 6 |
7 #include "ash/audio/sounds.h" | 7 #include "ash/audio/sounds.h" |
8 #include "ash/autoclick/autoclick_controller.h" | 8 #include "ash/autoclick/autoclick_controller.h" |
9 #include "ash/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
10 #include "ash/metrics/user_metrics_recorder.h" | 10 #include "ash/metrics/user_metrics_recorder.h" |
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
852 preload_engines.erase(it); | 852 preload_engines.erase(it); |
853 pref_service->SetString(prefs::kLanguagePreloadEngines, | 853 pref_service->SetString(prefs::kLanguagePreloadEngines, |
854 JoinString(preload_engines, ',')); | 854 JoinString(preload_engines, ',')); |
855 braille_ime_current_ = false; | 855 braille_ime_current_ = false; |
856 } | 856 } |
857 | 857 |
858 // Overridden from InputMethodManager::Observer. | 858 // Overridden from InputMethodManager::Observer. |
859 void AccessibilityManager::InputMethodChanged( | 859 void AccessibilityManager::InputMethodChanged( |
860 input_method::InputMethodManager* manager, | 860 input_method::InputMethodManager* manager, |
861 bool show_message) { | 861 bool show_message) { |
862 #if defined(USE_ASH) | 862 #if defined(USE_ASH) && !defined(USE_ATHENA) |
863 // Sticky keys is implemented only in ash. | 863 // Sticky keys is implemented only in ash. |
| 864 // TODO(dpolukhin): support Athena, crbug.com/408733. |
864 ash::Shell::GetInstance()->sticky_keys_controller()->SetModifiersEnabled( | 865 ash::Shell::GetInstance()->sticky_keys_controller()->SetModifiersEnabled( |
865 manager->IsISOLevel5ShiftUsedByCurrentInputMethod(), | 866 manager->IsISOLevel5ShiftUsedByCurrentInputMethod(), |
866 manager->IsAltGrUsedByCurrentInputMethod()); | 867 manager->IsAltGrUsedByCurrentInputMethod()); |
867 #endif | 868 #endif |
868 const chromeos::input_method::InputMethodDescriptor descriptor = | 869 const chromeos::input_method::InputMethodDescriptor descriptor = |
869 manager->GetActiveIMEState()->GetCurrentInputMethod(); | 870 manager->GetActiveIMEState()->GetCurrentInputMethod(); |
870 braille_ime_current_ = | 871 braille_ime_current_ = |
871 (descriptor.id() == extension_misc::kBrailleImeEngineId); | 872 (descriptor.id() == extension_misc::kBrailleImeEngineId); |
872 } | 873 } |
873 | 874 |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 chrome_vox_loaded_on_lock_screen_; | 1117 chrome_vox_loaded_on_lock_screen_; |
1117 } | 1118 } |
1118 | 1119 |
1119 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { | 1120 void AccessibilityManager::PostUnloadChromeVox(Profile* profile) { |
1120 // Do any teardown work needed immediately after ChromeVox actually unloads. | 1121 // Do any teardown work needed immediately after ChromeVox actually unloads. |
1121 if (system_sounds_enabled_) | 1122 if (system_sounds_enabled_) |
1122 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); | 1123 ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED); |
1123 } | 1124 } |
1124 | 1125 |
1125 } // namespace chromeos | 1126 } // namespace chromeos |
OLD | NEW |