Getting rid of GetDefaultProfile & fixing multi user issues with accessibility

chrome/browser/chromeos/accessibility/accessibility_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
 
 #include "ash/accessibility_delegate.h"
+#include "ash/session_state_observer.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/event_router.h"
 
 class Profile;
 
 namespace chromeos {
 
 struct AccessibilityStatusEventDetails {
   AccessibilityStatusEventDetails(
       bool enabled,
       ash::AccessibilityNotificationVisibility notify);
 
   AccessibilityStatusEventDetails(
       bool enabled,
       ash::MagnifierType magnifier_type,
       ash::AccessibilityNotificationVisibility notify);
 
   bool enabled;
   ash::MagnifierType magnifier_type;
   ash::AccessibilityNotificationVisibility notify;
 };
 
+// A class to attach / detach an object as a session state observer with a
+// scoped pointer.
+class ScopedSessionStateObserver {

[dmazzoni, 2013/12/13 17:30:07]

Could you move this to session_state_observer.h?

I see lots of other places where it could be used, like
message_center_settings_controller.cc. You don't have to refactor all of them
now, just put it somewhere where it's easy for others to use.

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

Done.

+ public:
+  explicit ScopedSessionStateObserver(ash::SessionStateObserver* observer);
+  virtual ~ScopedSessionStateObserver();
+
+ private:
+  ash::SessionStateObserver* observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedSessionStateObserver);
+};
+
 // AccessibilityManager changes the statuses of accessibility features
 // watching profile notifications and pref-changes.
 // TODO(yoshiki): merge MagnificationManager with AccessibilityManager.
 class AccessibilityManager : public content::NotificationObserver,
     public extensions::EventRouter::Observer,
-    extensions::api::braille_display_private::BrailleObserver {
+    extensions::api::braille_display_private::BrailleObserver,
+    public ash::SessionStateObserver {
  public:
   // Creates an instance of AccessibilityManager, this should be called once,
   // because only one instance should exist at the same time.
   static void Initialize();
   // Deletes the existing instance of AccessibilityManager.
   static void Shutdown();
   // Returns the existing instance. If there is no instance, returns NULL.
   static AccessibilityManager* Get();
 
   // On a user's first login into a device, any a11y features enabled/disabled
   // by the user on the login screen are enabled/disabled in the user's profile.
   // This class watches for profile changes and copies settings into the user's
   // profile when it detects a login with a newly created profile.
   class PrefHandler {
    public:
     explicit PrefHandler(const char* pref_path);
     virtual ~PrefHandler();
 
     // Should be called from AccessibilityManager::SetProfile().
     void HandleProfileChanged(Profile* previous_profile,
                               Profile* current_profile);
 
    private:
     const char* pref_path_;
   };
 
+  // Returns true when the accessibility menu should be shown.
+  bool ShouldShowAccessibilityMenu();
+
   // Enables or disables the large cursor.
   void EnableLargeCursor(bool enabled);
   // Returns true if the large cursor is enabled, or false if not.
   bool IsLargeCursorEnabled();
 
   // Enables or disable Sticky Keys.
   void EnableStickyKeys(bool enabled);
 
   // Returns true if Incognito mode is allowed, or false if not.
   bool IsIncognitoAllowed();
@@ skipping 23 matching lines @@
 
   // Returns true if autoclick is enabled.
   bool IsAutoclickEnabled();
 
   // Set the delay for autoclicking after stopping the cursor in milliseconds.
   void SetAutoclickDelay(int delay_ms);
 
   // Returns the autoclick delay in milliseconds.
   int GetAutoclickDelay() const;
 
+  // SessionStateObserver overrides:
+  virtual void ActiveUserChanged(const std::string& user_id) OVERRIDE;
+
   void SetProfileForTest(Profile* profile);
 
   static void SetBrailleControllerForTest(
       extensions::api::braille_display_private::BrailleController* controller);
 
   // Enables/disables system sounds.
   void EnableSystemSounds(bool system_sounds_enabled);
 
   // Initiates play of shutdown sound and returns it's duration.
   base::TimeDelta PlayShutdownSound();
@@ skipping 55 matching lines @@
   Profile* profile_;
 
   // Profile which ChromeVox is currently loaded to. If NULL, ChromeVox is not
   // loaded to any profile.
   bool chrome_vox_loaded_on_lock_screen_;
   bool chrome_vox_loaded_on_user_screen_;
 
   content::NotificationRegistrar notification_registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
+  scoped_ptr<ScopedSessionStateObserver> session_state_observer_;
 
   PrefHandler large_cursor_pref_handler_;
   PrefHandler spoken_feedback_pref_handler_;
   PrefHandler high_contrast_pref_handler_;
   PrefHandler autoclick_pref_handler_;
   PrefHandler autoclick_delay_pref_handler_;
 
   bool large_cursor_enabled_;
   bool sticky_keys_enabled_;
   bool spoken_feedback_enabled_;
   bool high_contrast_enabled_;
   bool autoclick_enabled_;
   int autoclick_delay_ms_;
 
   ash::AccessibilityNotificationVisibility spoken_feedback_notification_;
 
   base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_;
 
   bool should_speak_chrome_vox_announcements_on_user_screen_;
 
   bool system_sounds_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_