CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

ash/session/session_state_delegate_stub.h

Index: ash/session/session_state_delegate_stub.h
diff --git a/ash/session_state_delegate_stub.h b/ash/session/session_state_delegate_stub.h
similarity index 69%
rename from ash/session_state_delegate_stub.h
rename to ash/session/session_state_delegate_stub.h
index 5145fb8c6a95536f7952f43d2639c81fb3ffefd7..b649e133ee79975aaee5fdee0b87c60d1b6e0cc1 100644
--- a/ash/session_state_delegate_stub.h
+++ b/ash/session/session_state_delegate_stub.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SESSION_STATE_DELEGATE_STUB_H_
-#define ASH_SESSION_STATE_DELEGATE_STUB_H_
+#ifndef ASH_SESSION_SESSION_STATE_DELEGATE_STUB_H_
+#define ASH_SESSION_SESSION_STATE_DELEGATE_STUB_H_
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/gfx/image/image_skia.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace ash {
 
@@ -33,17 +33,10 @@ class SessionStateDelegateStub : public SessionStateDelegate {
   virtual void UnlockScreen() OVERRIDE;
   virtual bool IsUserSessionBlocked() const OVERRIDE;
   virtual SessionState GetSessionState() const OVERRIDE;
-  virtual const base::string16 GetUserDisplayName(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const base::string16 GetUserGivenName(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const std::string GetUserEmail(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const std::string GetUserID(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const gfx::ImageSkia& GetUserImage(
+  virtual const UserInfo* GetUserInfo(MultiProfileIndex index) const OVERRIDE;
+  virtual const UserInfo* GetUserInfo(
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
+  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
   virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
   virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
   virtual void AddSessionStateObserver(
@@ -54,12 +47,11 @@ class SessionStateDelegateStub : public SessionStateDelegate {
  private:
   bool screen_locked_;
 
-  // A pseudo user image.
-  gfx::ImageSkia user_image_;
+  scoped_ptr<UserInfo> user_info_;

[Nikita (slow), 2014/04/29 13:59:27]

This is for the active user only?

[oshima, 2014/04/29 17:59:54]

This is just a stub used in ash_shell. Updated the comment

 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SESSION_STATE_DELEGATE_STUB_H_
+#endif  // ASH_SESSION_SESSION_STATE_DELEGATE_STUB_H_