Adjust ChromeVox (spoken feedback) strings and make it possible for announcemen

chrome/browser/chromeos/accessibility/accessibility_manager.cc

 // Copyright (c) 2013 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/accessibility/accessibility_manager.h"
 
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_accessibility_state.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/file_reader.h"
 #include "extensions/common/extension_resource.h"
 #include "grit/browser_resources.h"
@@ skipping 216 matching lines @@
       large_cursor_pref_handler_(prefs::kLargeCursorEnabled),
       spoken_feedback_pref_handler_(prefs::kSpokenFeedbackEnabled),
       high_contrast_pref_handler_(prefs::kHighContrastEnabled),
       autoclick_pref_handler_(prefs::kAutoclickEnabled),
       autoclick_delay_pref_handler_(prefs::kAutoclickDelayMs),
       large_cursor_enabled_(false),
       sticky_keys_enabled_(false),
       spoken_feedback_enabled_(false),
       high_contrast_enabled_(false),
       autoclick_delay_ms_(ash::AutoclickController::kDefaultAutoclickDelayMs),
-      spoken_feedback_notification_(ash::A11Y_NOTIFICATION_NONE) {
-
+  spoken_feedback_notification_(ash::A11Y_NOTIFICATION_NONE),
+  should_speak_chrome_vox_announcements_on_user_screen_(true) {
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_SESSION_STARTED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_DESTROYED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
@@ skipping 93 matching lines @@
     return;
 
   const bool enabled =
       profile_->GetPrefs()->GetBoolean(prefs::kSpokenFeedbackEnabled);
 
   if (spoken_feedback_enabled_ == enabled)
     return;
 
   spoken_feedback_enabled_ = enabled;
 
-  Speak(l10n_util::GetStringUTF8(
-      enabled ? IDS_CHROMEOS_ACC_SPOKEN_FEEDBACK_ENABLED :
-      IDS_CHROMEOS_ACC_SPOKEN_FEEDBACK_DISABLED).c_str());
-
   ExtensionAccessibilityEventRouter::GetInstance()->
       SetAccessibilityEnabled(enabled);
 
   AccessibilityStatusEventDetails details(enabled,
                                           spoken_feedback_notification_);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK,
       content::NotificationService::AllSources(),
       content::Details<AccessibilityStatusEventDetails>(&details));
 
-  if (enabled)
+  if (enabled) {
     LoadChromeVox();
-  else
-    UnloadChromeVox();
+    ExtensionAccessibilityEventRouter::GetInstance()->
+        OnSpokenFeedbackEnabled(profile_,
+            chrome_vox_loaded_on_lock_screen_ ||
+            should_speak_chrome_vox_announcements_on_user_screen_);
+
+    should_speak_chrome_vox_announcements_on_user_screen_ =
+        chrome_vox_loaded_on_lock_screen_;
+  } else {
+    ExtensionAccessibilityEventRouter::GetInstance()->
+        OnSpokenFeedbackDisabled(profile_);
+
+    // Give ChromeVox a chance to speak/braille outgoing messages.

[dmazzoni, 2013/10/25 23:09:16]

How about "announce" instead of speak/braille

+    content::BrowserThread::PostDelayedTask(
+        content::BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&AccessibilityManager::UnloadChromeVox,
+                   base::Unretained(this)),
+        base::TimeDelta::FromSeconds(1));

[dmazzoni, 2013/10/25 23:09:16]

I know it's trivial, but let's make 1 a named constant.

I'm a little wary of any timeout other than zero. Is this really best?

+  }
 }
 
 void AccessibilityManager::LoadChromeVox() {
   ScreenLocker* screen_locker = ScreenLocker::default_screen_locker();
   if (screen_locker && screen_locker->locked()) {
     // If on the lock screen, loads ChromeVox only to the lock screen as for
     // now. On unlock, it will be loaded to the user screen.
     // (see. AccessibilityManager::Observe())
     LoadChromeVoxToLockScreen();
     return;
@@ skipping 285 matching lines @@
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
       // Update |profile_| when entering the login screen.
       Profile* profile = ProfileManager::GetDefaultProfile();
       if (ProfileHelper::IsSigninProfile(profile))
         SetProfile(profile);
       break;
     }
     case chrome::NOTIFICATION_SESSION_STARTED:
       // Update |profile_| when entering a session.
       SetProfile(ProfileManager::GetDefaultProfile());
+
+      // Ensure ChromeVox makes announcements at the start of new sessions.
+      should_speak_chrome_vox_announcements_on_user_screen_ = true;
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Update |profile_| when exiting a session or shutting down.
       Profile* profile = content::Source<Profile>(source).ptr();
       if (profile_ == profile)
         SetProfile(NULL);
       break;
     }
     case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
       bool is_screen_locked = *content::Details<bool>(details).ptr();
       if (is_screen_locked) {
         if (spoken_feedback_enabled_)
           LoadChromeVoxToLockScreen();
       } else {
         UnloadChromeVoxFromLockScreen();
 
         if (spoken_feedback_enabled_)
           LoadChromeVoxToUserScreen();
       }
     }
   }
 }
 
 }  // namespace chromeos