cros: Clean up SessionStateDelegate refs in Chrome

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h

 // Copyright 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_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
-#include "ash/common/session/session_state_observer.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/core/transient_window_observer.h"
 
 class Browser;
 class MultiUserNotificationBlockerChromeOS;
 class MultiUserNotificationBlockerChromeOSTest;
 
 namespace content {
@@ skipping 23 matching lines @@
 // Note:
 // - aura::Window::Hide() is currently hiding the window and all owned transient
 //   children. However aura::Window::Show() is only showing the window itself.
 //   To address that, all transient children (and their children) are remembered
 //   in |transient_window_to_visibility_| and monitored to keep track of the
 //   visibility changes from the owning user. This way the visibility can be
 //   changed back to its requested state upon showing by us - or when the window
 //   gets detached from its current owning parent.
 class MultiUserWindowManagerChromeOS
     : public MultiUserWindowManager,
-      public ash::SessionStateObserver,
+      public user_manager::UserManager::UserSessionStateObserver,
       public aura::WindowObserver,
       public content::NotificationObserver,
       public wm::TransientWindowObserver {
  public:
   // The speed which should be used to perform animations.
   enum AnimationSpeed {
     ANIMATION_SPEED_NORMAL,   // The normal animation speed.
     ANIMATION_SPEED_FAST,     // Unit test speed which test animations.
     ANIMATION_SPEED_DISABLED  // Unit tests which do not require animations.
   };
@@ skipping 14 matching lines @@
   bool AreWindowsSharedAmongUsers() const override;
   void GetOwnersOfVisibleWindows(
       std::set<AccountId>* account_ids) const override;
   bool IsWindowOnDesktopOfUser(aura::Window* window,
                                const AccountId& account_id) const override;
   const AccountId& GetUserPresentingWindow(aura::Window* window) const override;
   void AddUser(content::BrowserContext* context) override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
 
-  // SessionStateObserver overrides:
-  void ActiveUserChanged(const AccountId& account_id) override;
+  // user_manager::UserManager::UserSessionStateObserver overrides:
+  void ActiveUserChanged(const user_manager::User* active_user) override;
 
   // WindowObserver overrides:
   void OnWindowDestroyed(aura::Window* window) override;
   void OnWindowVisibilityChanging(aura::Window* window, bool visible) override;
   void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
 
   // TransientWindowObserver overrides:
   void OnTransientChildAdded(aura::Window* window,
                              aura::Window* transient) override;
   void OnTransientChildRemoved(aura::Window* window,
@@ skipping 151 matching lines @@
 
   // The animation between users.
   std::unique_ptr<UserSwitchAnimatorChromeOS> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOS);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_