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

chrome/browser/chromeos/login/wizard_accessibility_helper.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_helper.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility_util.h"
@@ skipping 74 matching lines @@
 
 bool WizardAccessibilityHelper::IsAccessibilityEnabled() {
   return g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
       prefs::kAccessibilityEnabled);
 }
 
 void WizardAccessibilityHelper::MaybeSpeak(const char* str, bool queue,
     bool interruptible) {
   if (IsAccessibilityEnabled()) {
-    accessibility_handler_->Speak(str, queue, interruptible);
+    accessibility::Speak(str, queue, interruptible);
   }
 }
 
 void WizardAccessibilityHelper::ToggleAccessibility() {
   if (!IsAccessibilityEnabled()) {
     VLOG(1) << "Enabling accessibility.";
     if (!registered_notifications_)
       RegisterNotifications();
     SetAccessibilityEnabled(true);
   } else {
     SetAccessibilityEnabled(false);
     if (registered_notifications_)
       UnregisterNotifications();
   }
 }
 
 void WizardAccessibilityHelper::SetAccessibilityEnabled(bool enabled) {
   bool doSpeak = (IsAccessibilityEnabled() != enabled);
   accessibility::EnableAccessibility(enabled, NULL);
   if (doSpeak) {
-    accessibility_handler_->Speak(enabled ?
+    accessibility::Speak(enabled ?
         l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_ENABLED).c_str() :
         l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_DISABLED).c_str(),
         false, true);

[hashimoto, 2011/08/29 09:41:56]

This code will speak the message twice because now you call Spaek also in
accessibility::EnableAccessibility.

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

Done.

   }
 }
 
 }  // namespace chromeos