Getting rid of GetDefaultProfile & fixing multi user issues with accessibility

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/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/sticky_keys.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
@@ skipping 266 matching lines @@
       autoclick_delay_pref_handler_(prefs::kAutoclickDelayMs),
       large_cursor_enabled_(false),
       sticky_keys_enabled_(false),
       spoken_feedback_enabled_(false),
       high_contrast_enabled_(false),
       autoclick_enabled_(false),
       autoclick_delay_ms_(ash::AutoclickController::kDefaultAutoclickDelayMs),
       spoken_feedback_notification_(ash::A11Y_NOTIFICATION_NONE),
       weak_ptr_factory_(this),
       should_speak_chrome_vox_announcements_on_user_screen_(true),
+      session_state_observer_installed_(false),
       system_sounds_enabled_(false) {
   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,
                               chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_EXTENSION_REMOVED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_EXTENSION_UNLOADED,
                               content::NotificationService::AllSources());
+
   GetBrailleController()->AddObserver(this);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   media::SoundsManager* manager = media::SoundsManager::Get();
   manager->Initialize(SOUND_SHUTDOWN,
                       bundle.GetRawDataResource(IDR_SOUND_SHUTDOWN_WAV));
   manager->Initialize(
       SOUND_SPOKEN_FEEDBACK_ENABLED,
       bundle.GetRawDataResource(IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV));
   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_)->
         event_router()->UnregisterObserver(this);
   }
+
+  if (session_state_observer_installed_)
+    ash::Shell::GetInstance()->session_state_delegate()->
+        RemoveSessionStateObserver(this);

[dmazzoni, 2013/12/13 16:15:07]

I think we should have a ScopedSessionStateObserver class to make this more
foolproof. It'd eliminate the need for a boolean and code in the destructor.

[Mr4D (OOO till 08-26), 2013/12/13 17:21:13]

Done.

+}
+
+bool AccessibilityManager::ShouldShowAccessibilityMenu() {
+  // If any of the loaded profiles has an accessibility feature turned on, we

[dmazzoni, 2013/12/13 16:15:07]

If they have an accessibility feature turned on, *or* if they chose the checkbox
to always show the accessibility menu.

[Mr4D (OOO till 08-26), 2013/12/13 17:21:13]

Done.

+  // should return true to show the menu.
+  std::vector<Profile*> profiles =
+      g_browser_process->profile_manager()->GetLoadedProfiles();
+  for (std::vector<Profile*>::iterator it = profiles.begin();
+       it != profiles.end();
+       ++it) {
+    PrefService* pref_service = (*it)->GetPrefs();
+    if (pref_service->GetBoolean(prefs::kStickyKeysEnabled) ||
+        pref_service->GetBoolean(prefs::kLargeCursorEnabled) ||
+        pref_service->GetBoolean(prefs::kSpokenFeedbackEnabled) ||
+        pref_service->GetBoolean(prefs::kHighContrastEnabled) ||
+        pref_service->GetBoolean(prefs::kAutoclickEnabled) ||
+        pref_service->GetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu) ||
+        pref_service->GetBoolean(prefs::kScreenMagnifierEnabled))
+      return true;
+  }
+  return false;
 }
 
 void AccessibilityManager::EnableLargeCursor(bool enabled) {
   if (!profile_)
     return;
 
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->SetBoolean(prefs::kLargeCursorEnabled, enabled);
   pref_service->CommitPendingWrite();
 }
@@ skipping 370 matching lines @@
 
   profile_ = profile;
   UpdateLargeCursorFromPref();
   UpdateStickyKeysFromPref();
   UpdateSpokenFeedbackFromPref();
   UpdateHighContrastFromPref();
   UpdateAutoclickFromPref();
   UpdateAutoclickDelayFromPref();
 }
 
+void AccessibilityManager::ActiveUserChanged(const std::string& user_id) {
+  SetProfile(ProfileManager::GetActiveUserProfile());

[dmazzoni, 2013/12/13 16:15:07]

Does this need to take login / lock screen into account? Just making sure
AcitveUserChanged wouldn't get called when opening the login screen, for
example.

[Mr4D (OOO till 08-26), 2013/12/13 17:21:13]

This only gets called when a user switches actively to another (logged in) user.
So to answer your question: No the login screen is not able to call this
function - and no login will call this function either.

+}
+
 void AccessibilityManager::SetProfileForTest(Profile* profile) {
   SetProfile(profile);
 }
 
 void AccessibilityManager::SetBrailleControllerForTest(
     BrailleController* controller) {
   g_braille_controller_for_test = controller;
 }
 
 void AccessibilityManager::EnableSystemSounds(bool system_sounds_enabled) {
@@ skipping 48 matching lines @@
   }
 }
 
 void AccessibilityManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
       // Update |profile_| when entering the login screen.
-      Profile* profile = ProfileManager::GetDefaultProfile();
+      Profile* profile = ProfileManager::GetActiveUserProfile();
       if (ProfileHelper::IsSigninProfile(profile))
         SetProfile(profile);
       break;
     }
     case chrome::NOTIFICATION_SESSION_STARTED:
       // Update |profile_| when entering a session.
-      SetProfile(ProfileManager::GetDefaultProfile());
+      SetProfile(ProfileManager::GetActiveUserProfile());
 
       // Ensure ChromeVox makes announcements at the start of new sessions.
       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_installed_ && ash::Shell::HasInstance()) {
+        session_state_observer_installed_ = true;
+        ash::Shell::GetInstance()->session_state_delegate()->
+            AddSessionStateObserver(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)
         SetProfile(NULL);
       break;
     }
     case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
       bool is_screen_locked = *content::Details<bool>(details).ptr();
@@ skipping 91 matching lines @@
         event_router()->UnregisterObserver(this);
   }
 }
 
 void AccessibilityManager::PlaySound(int sound_key) const {
   if (system_sounds_enabled_)
     media::SoundsManager::Get()->Play(sound_key);
 }
 
 }  // namespace chromeos