Track all profiles ChromeVox loads to.

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/metrics/user_metrics_recorder.h"
 #include "ash/session_state_delegate.h"
@@ skipping 325 matching lines @@
   manager->Initialize(
       SOUND_SPOKEN_FEEDBACK_DISABLED,
       bundle.GetRawDataResource(IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV));
 }
 
 AccessibilityManager::~AccessibilityManager() {
   CHECK(this == g_accessibility_manager);
 
   // Component extensions don't always notify us when they're unloaded. Ensure
   // we clean up ChromeVox observers here.
-  if (profile_) {
-    extensions::ExtensionSystem::Get(profile_)->
+  for (std::set<Profile*>::iterator it = chromevox_profiles_.begin();
+       it != chromevox_profiles_.end();
+       it++) {
+    extensions::ExtensionSystem::Get(*it)->
         event_router()->UnregisterObserver(this);
   }
 }
 
 bool AccessibilityManager::ShouldShowAccessibilityMenu() {
   // If any of the loaded profiles has an accessibility feature turned on - or
   // enforced to always show the menu - we return true to show the menu.
   std::vector<Profile*> profiles =
       g_browser_process->profile_manager()->GetLoadedProfiles();
   for (std::vector<Profile*>::iterator it = profiles.begin();
@@ skipping 380 matching lines @@
 
   large_cursor_pref_handler_.HandleProfileChanged(profile_, profile);
   spoken_feedback_pref_handler_.HandleProfileChanged(profile_, profile);
   high_contrast_pref_handler_.HandleProfileChanged(profile_, profile);
   autoclick_pref_handler_.HandleProfileChanged(profile_, profile);
   autoclick_delay_pref_handler_.HandleProfileChanged(profile_, profile);
 
   if (!profile && profile_) {
     extensions::ExtensionSystem::Get(profile_)->
         event_router()->UnregisterObserver(this);
+    std::set<Profile*>::iterator item = chromevox_profiles_.find(profile_);
+    if (item != chromevox_profiles_.end())
+      chromevox_profiles_.erase(item);

[James Cook, 2014/01/06 20:38:19]

I think you can just do chromevox_profiles_.erase() without checking if it is
there.

   }
 
   if (profile && spoken_feedback_enabled_)
     SetUpPreLoadChromeVox(profile);
 
   if (!profile_ && profile)
     CheckBrailleState();
 
   profile_ = profile;
   UpdateLargeCursorFromPref();
@@ skipping 89 matching lines @@
       should_speak_chrome_vox_announcements_on_user_screen_ = true;
 
       // Add a session state observer to be able to monitor session changes.
       if (!session_state_observer_.get() && ash::Shell::HasInstance())
         session_state_observer_.reset(
             new ash::ScopedSessionStateObserver(this));
       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)

[James Cook, 2014/01/06 20:38:19]

Should this clean up observers if *any* profile in the set is destroyed?  I'm
not sure if that can happen in practice (maybe with multi-profile) but would
probably be safer.

         SetProfile(NULL);
       break;
     }
     case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
       bool is_screen_locked = *content::Details<bool>(details).ptr();
       if (spoken_feedback_enabled_) {
         if (is_screen_locked) {
           LoadChromeVoxToLockScreen();
 
           // Status tray gets verbalized by user screen ChromeVox, so we need
@@ skipping 69 matching lines @@
 
 void AccessibilityManager::SetUpPreLoadChromeVox(Profile* profile) {
   // Do any setup work needed immediately before ChromeVox actually loads.
   PlaySound(SOUND_SPOKEN_FEEDBACK_ENABLED);
 
   if (profile) {
     extensions::ExtensionSystem::Get(profile)->
         event_router()->RegisterObserver(this,
             extensions::api::experimental_accessibility::
                 OnChromeVoxLoadStateChanged::kEventName);
+    chromevox_profiles_.insert(profile);
   }
 }
 
 void AccessibilityManager::TearDownPostUnloadChromeVox(Profile* profile) {
   // Do any teardown work needed immediately after ChromeVox actually unloads.
   if (profile) {
     extensions::ExtensionSystem::Get(profile)->
         event_router()->UnregisterObserver(this);
+    std::set<Profile*>::iterator item = chromevox_profiles_.find(profile_);
+    if (item != chromevox_profiles_.end())

[James Cook, 2014/01/06 20:38:19]

same thing, I don't think you need to check if it is there

+      chromevox_profiles_.erase(item);
   }
 }
 
 void AccessibilityManager::PlaySound(int sound_key) const {
-  if (system_sounds_enabled_)
-    media::SoundsManager::Get()->Play(sound_key);
+  media::SoundsManager::Get()->Play(sound_key);
 }
 
 }  // namespace chromeos