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

Unified Diff: chrome/browser/chromeos/login/wizard_accessibility_handler.cc

Issue 7781004: Move Speak() in accessibility_utils, speak enable and disable strings when (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused headers Created 9 years, 4 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
Index: chrome/browser/chromeos/login/wizard_accessibility_handler.cc
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
index a23453b6641be649605c67a12956410d408d54a9..3e1e16cf75097ec9356d09dbfa17f6b25d0031fa 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
@@ -11,8 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "chrome/browser/accessibility_events.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
+#include "chrome/browser/chromeos/accessibility_util.h"
#include "chrome/browser/extensions/extension_accessibility_api.h"
#include "chrome/browser/extensions/extension_accessibility_api_constants.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -109,25 +108,7 @@ void WizardAccessibilityHandler::Observe(
std::string description;
EarconType earcon = NO_EARCON;
DescribeAccessibilityEvent(type, control_info, &description, &earcon);
- Speak(description.c_str(), false, true);
-}
-
-void WizardAccessibilityHandler::Speak(const char* speak_str,
- bool queue,
- bool interruptible) {
- if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
- if (queue || !interruptible) {
- std::string props = "";
- props.append("enqueue=");
- props.append(queue ? "1;" : "0;");
- props.append("interruptible=");
- props.append(interruptible ? "1;" : "0;");
- chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
- SetSpeakProperties(props.c_str());
- }
- chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
- Speak(speak_str);
- }
+ accessibility::Speak(description.c_str(), false, true);
}
void WizardAccessibilityHandler::DescribeAccessibilityEvent(

Powered by Google App Engine
This is Rietveld 408576698