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

ash/session/session_state_delegate.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 ASH_SESSION_STATE_DELEGATE_H_
-#define ASH_SESSION_STATE_DELEGATE_H_
+#ifndef ASH_SESSION_SESSION_STATE_DELEGATE_H_
+#define ASH_SESSION_SESSION_STATE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/strings/string16.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace content {
 class BrowserContext;
 }
 
 namespace gfx {
 class ImageSkia;
 }  // namespace gfx
 
 namespace ash {
 
 class SessionStateObserver;
+class UserInfo;
 
 // The index for the multi-profile item to use. The list is always LRU sorted
 // So that the index #0 is the currently active user.
 typedef int MultiProfileIndex;
 
 // A list of user_id.
 typedef std::vector<std::string> UserIdList;
 
 // Delegate for checking and modifying the session state.
 // TODO(oshima): Replace MultiProfileIndex with BrowsreContext, bacause
@@ skipping 62 matching lines @@
   virtual void UnlockScreen() = 0;
 
   // Returns |true| if user session blocked by some overlying UI. It can be
   // login screen, lock screen or screen for adding users into multi-profile
   // session.
   virtual bool IsUserSessionBlocked() const = 0;
 
   // Returns current session state.
   virtual SessionState GetSessionState() const = 0;
 
-  // Gets the displayed name for the user with the given |index|.
+  // TODO(oshima): consolidate these two GetUserInfo.
+
+  // Gets the user info for the user with the given |index|.
   // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
-  virtual const base::string16 GetUserDisplayName(
-      MultiProfileIndex index) const = 0;
-
-  // Gets the given name of the user with |index|. An empty string can be
-  // returned if the given name of the user is unknown.
-  // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
-  virtual const base::string16 GetUserGivenName(
-      MultiProfileIndex index) const = 0;
-
-  // Gets the display email address for the user with the given |index|.
-  // The display email address might contains some periods in the email name
-  // as well as capitalized letters. For example: "Foo.Bar@mock.com".
-  // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
-  virtual const std::string GetUserEmail(MultiProfileIndex index) const = 0;
-
-  // Gets the user id (sanitized email address) for the user with the given
-  // |index|. The function would return something like "foobar@mock.com".
-  // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
-  virtual const std::string GetUserID(MultiProfileIndex index) const = 0;
+  virtual const UserInfo* GetUserInfo(MultiProfileIndex index) const = 0;
 
   // Gets the avatar image for the user associated with the |context|.
-  virtual const gfx::ImageSkia& GetUserImage(
+  virtual const UserInfo* GetUserInfo(
       content::BrowserContext* context) const = 0;
 
   // Whether or not the window's title should show the avatar.
-  virtual bool ShouldShowAvatar(aura::Window* window) = 0;
+  virtual bool ShouldShowAvatar(aura::Window* window) const = 0;
 
   // Switches to another active user with |user_id|
   // (if that user has already signed in).
   virtual void SwitchActiveUser(const std::string& user_id) = 0;
 
   // Switches the active user to the next or previous user, with the same
   // ordering as GetLoggedInUsers.
   virtual void CycleActiveUser(CycleUser cycle_user) = 0;
 
   // Adds or removes sessions state observer.
   virtual void AddSessionStateObserver(SessionStateObserver* observer) = 0;
   virtual void RemoveSessionStateObserver(SessionStateObserver* observer) = 0;
 };
 
 }  // namespace ash
 
-#endif  // ASH_SESSION_STATE_DELEGATE_H_
+#endif  // ASH_SESSION_SESSION_STATE_DELEGATE_H_