Move Speak() in accessibility_utils, speak enable and disable strings when

chrome/browser/chromeos/login/wizard_accessibility_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
 
 #include <algorithm>
 
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"

[dmazzoni, 2011/08/29 22:30:03]

I think you can delete this, check for other includes that this file doesn't
need anymore.

[Zachary Kuznia, 2011/08/30 08:03:36]

Done.

 #include "chrome/browser/chromeos/cros/speech_synthesis_library.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"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 77 matching lines @@
 
 void WizardAccessibilityHandler::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   const AccessibilityControlInfo *control_info =
       Details<const AccessibilityControlInfo>(details).ptr();
   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(
     int event_type,
     const AccessibilityControlInfo* control_info,
     std::string* out_spoken_description,
     EarconType* out_earcon) {
   *out_spoken_description = std::string();
   *out_earcon = NO_EARCON;
 
@@ skipping 296 matching lines @@
   } else if (!inserted.empty()) {
     // Speak inserted text.
     AppendUtterance(inserted, out_spoken_description);
   } else if (!deleted.empty()) {
     // Speak deleted text.
     AppendUtterance(deleted, out_spoken_description);
   }
 }
 
 }  // namespace chromeos