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

ash/session_state_delegate_stub.h

Index: ash/session_state_delegate_stub.h
diff --git a/ash/session_state_delegate_stub.h b/ash/session_state_delegate_stub.h
index db9b711483865301b7451d4ae1b0018dd4d33d4c..707c53efa0a59aa58957a6e1b241aa9ace772ea9 100644
--- a/ash/session_state_delegate_stub.h
+++ b/ash/session_state_delegate_stub.h
@@ -8,6 +8,7 @@
 #include "ash/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 
@@ -18,16 +19,28 @@ class SessionStateDelegateStub : public SessionStateDelegate {
   virtual ~SessionStateDelegateStub();
 
   // SessionStateDelegate:
-  virtual bool HasActiveUser() const OVERRIDE;
+  virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
+  virtual int NumberOfLoggedInUsers() const OVERRIDE;
   virtual bool IsActiveUserSessionStarted() const OVERRIDE;
   virtual bool CanLockScreen() const OVERRIDE;
   virtual bool IsScreenLocked() const OVERRIDE;
   virtual void LockScreen() OVERRIDE;
   virtual void UnlockScreen() OVERRIDE;
+  virtual const base::string16 GetUserDisplayName(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const std::string GetUserEmail(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const gfx::ImageSkia& GetUserImage(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual void GetLoggedInUsers(UserEmailList* users) OVERRIDE;
+  virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
 
  private:
   bool screen_locked_;
 
+  // A pseudo user image.
+  gfx::ImageSkia null_image_;
+
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };