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 1d40642b883dd56f8a5ddffa30be1973b09af17e..4d292cf932ae8895f866d3dfc1ddb037ea482ecb 100644 |
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc |
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc |
@@ -223,7 +223,7 @@ void InjectChromeVoxContentScript( |
for (size_t i = 0; i < content_scripts.size(); i++) { |
const extensions::UserScript& script = content_scripts[i]; |
for (size_t j = 0; j < script.js_scripts().size(); ++j) { |
- const extensions::UserScript::File &file = script.js_scripts()[j]; |
+ const extensions::UserScript::File& file = script.js_scripts()[j]; |
extensions::ExtensionResource resource = extension->GetResource( |
file.relative_path()); |
loader->AppendScript(resource); |
@@ -374,6 +374,12 @@ AccessibilityManager::AccessibilityManager() |
manager->Initialize( |
SOUND_SPOKEN_FEEDBACK_DISABLED, |
bundle.GetRawDataResource(IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV)); |
+ manager->Initialize(SOUND_PASSTHROUGH, |
+ bundle.GetRawDataResource(IDR_SOUND_PASSTHROUGH_WAV)); |
+ manager->Initialize(SOUND_EXIT_SCREEN, |
+ bundle.GetRawDataResource(IDR_SOUND_EXIT_SCREEN_WAV)); |
+ manager->Initialize(SOUND_ENTER_SCREEN, |
+ bundle.GetRawDataResource(IDR_SOUND_ENTER_SCREEN_WAV)); |
} |
AccessibilityManager::~AccessibilityManager() { |
@@ -694,6 +700,11 @@ void AccessibilityManager::OnLocaleChanged() { |
EnableSpokenFeedback(true, ash::A11Y_NOTIFICATION_NONE); |
} |
+void AccessibilityManager::PlayEarcon(int sound_key) { |
+ DCHECK(sound_key < chromeos::SOUND_COUNT); |
+ ash::PlaySystemSoundIfSpokenFeedback(sound_key); |
+} |
+ |
bool AccessibilityManager::IsHighContrastEnabled() { |
return high_contrast_enabled_; |
} |