Getting rid of GetDefaultProfile & fixing multi user issues with accessibility

chrome/browser/chromeos/accessibility/magnification_manager.cc

 // Copyright (c) 2012 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/magnification_manager.h"
 
 #include <limits>
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
+#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 namespace chromeos {
 
 namespace {
 static MagnificationManager* g_magnification_manager = NULL;
 }
 
 class MagnificationManagerImpl : public MagnificationManager,
-                                 public content::NotificationObserver {
+                                 public content::NotificationObserver,
+                                 public ash::SessionStateObserver {
  public:
   MagnificationManagerImpl()
       : first_time_update_(true),
         profile_(NULL),
         magnifier_enabled_pref_handler_(prefs::kScreenMagnifierEnabled),
         magnifier_type_pref_handler_(prefs::kScreenMagnifierType),
         magnifier_scale_pref_handler_(prefs::kScreenMagnifierScale),
         type_(ash::kDefaultMagnifierType),
-        enabled_(false) {
+        enabled_(false),
+        session_state_observer_installed_(false) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_SESSION_STARTED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_PROFILE_DESTROYED,
                    content::NotificationService::AllSources());
   }
 
   virtual ~MagnificationManagerImpl() {
     CHECK(this == g_magnification_manager);
+    if (session_state_observer_installed_)

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

Nit: {}

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

Done.

+      ash::Shell::GetInstance()->session_state_delegate()->
+          RemoveSessionStateObserver(this);
   }
 
   // MagnificationManager implimentation:
   virtual bool IsMagnifierEnabled() const OVERRIDE {
     return enabled_;
   }
 
   virtual ash::MagnifierType GetMagnifierType() const OVERRIDE {
     return type_;
   }
@@ skipping 27 matching lines @@
     if (!profile_)
       return std::numeric_limits<double>::min();
 
     return profile_->GetPrefs()->GetDouble(prefs::kScreenMagnifierScale);
   }
 
   virtual void SetProfileForTest(Profile* profile) OVERRIDE {
     SetProfile(profile);
   }
 
+  // SessionStateObserver overrides:
+  virtual void ActiveUserChanged(const std::string& user_id) OVERRIDE {
+    SetProfile(ProfileManager::GetActiveUserProfile());
+  }
+
  private:
   void SetProfile(Profile* profile) {
     pref_change_registrar_.reset();
 
     if (profile) {
       // TODO(yoshiki): Move following code to PrefHandler.
       pref_change_registrar_.reset(new PrefChangeRegistrar);
       pref_change_registrar_->Init(profile->GetPrefs());
       pref_change_registrar_->Add(
           prefs::kScreenMagnifierEnabled,
@@ skipping 84 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());
+
+        // 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;
       }
     }
   }
 
   bool first_time_update_;
   Profile* profile_;
 
   AccessibilityManager::PrefHandler magnifier_enabled_pref_handler_;
   AccessibilityManager::PrefHandler magnifier_type_pref_handler_;
   AccessibilityManager::PrefHandler magnifier_scale_pref_handler_;
 
   ash::MagnifierType type_;
   bool enabled_;
+
+  // True when the session state observer was installed.
+  bool session_state_observer_installed_;
+
   content::NotificationRegistrar registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(MagnificationManagerImpl);
 };
 
 // static
 void MagnificationManager::Initialize() {
   CHECK(g_magnification_manager == NULL);
   g_magnification_manager = new MagnificationManagerImpl();
 }
 
 // static
 void MagnificationManager::Shutdown() {
   CHECK(g_magnification_manager);
   delete g_magnification_manager;
   g_magnification_manager = NULL;
 }
 
 // static
 MagnificationManager* MagnificationManager::Get() {
   return g_magnification_manager;
 }
 
 }  // namespace chromeos