Adding new user menu section to the SystemTrayMenu & refactoring of user access

ash/session_state_delegate.h

Index: ash/session_state_delegate.h
diff --git a/ash/session_state_delegate.h b/ash/session_state_delegate.h
index f5ee359667597ff975afbecbf3742e90d256a845..f5451cff48e1fd61d5a6297e8775521b3aaac38a 100644
--- a/ash/session_state_delegate.h
+++ b/ash/session_state_delegate.h
@@ -5,17 +5,36 @@
 #ifndef ASH_SESSION_STATE_DELEGATE_H_
 #define ASH_SESSION_STATE_DELEGATE_H_
 
+#include <string>
+#include <vector>
+
 #include "ash/ash_export.h"
+#include "base/string16.h"
+
+namespace gfx {
+class ImageSkia;
+}  // namespace gfx
 
 namespace ash {
 
+// 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 email addresses.
+typedef std::vector<std::string> UserEmailList;
+
 // Delegate for checking and modifying the session state.
 class ASH_EXPORT SessionStateDelegate {
  public:
   virtual ~SessionStateDelegate() {};
 
-  // Returns |true| if a session is in progress and there is an active user.
-  virtual bool HasActiveUser() const = 0;
+  // Returns the maximum possible number of logged in users.
+  virtual int GetMaximumNumberOfLoggedInUsers() const = 0;
+
+  // Returns the number of signed in users. If 0 is returned, there is either
+  // no session in progress or no active user.
+  virtual int NumberOfLoggedInUsers() const = 0;
 
   // Returns |true| if the session has been fully started for the active user.
   // When a user becomes active, the profile and browser UI are not immediately
@@ -34,6 +53,25 @@ class ASH_EXPORT SessionStateDelegate {
 
   // Unlocks the screen.
   virtual void UnlockScreen() = 0;
+
+  // Gets the displayed name 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 email address for the user with the given |index|.
+  // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
+  virtual const std::string GetUserEmail(MultiProfileIndex index) const = 0;

[Nikita (slow), 2013/05/17 17:00:32]

nit: GetUserId

[Mr4D (OOO till 08-26), 2013/05/17 18:45:09]

Actually: No. This is the eMail address for displaying. Renaming that into
GetUserId would be odd. That said - we can of course change this.

+
+  // Gets the avatar image for the user with the given |index|.
+  // Note that |index| can at maximum be |NumberOfLoggedInUsers() - 1|.
+  virtual const gfx::ImageSkia& GetUserImage(MultiProfileIndex index) const = 0;
+
+  // Returns a list of all logged in users.
+  virtual void GetLoggedInUsers(UserEmailList* users) = 0;
+
+  // Switches to another active user (if that user has already signed in).
+  virtual void SwitchActiveUser(const std::string& email) = 0;

[Nikita (slow), 2013/05/17 17:00:32]

nit: user_id

[Mr4D (OOO till 08-26), 2013/05/17 18:45:09]

Okay - even though that is also quite odd since it is the email address. If we
consider changing that to some "ominous number" that is fine with me, but till
then email seems the better thing to use since that is what it is. I can change
later if you want. :)

 };
 
 }  // namespace ash