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

ash/test/test_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_TEST_TEST_SESSION_STATE_DELEGATE_H_
 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
 
 #include "ash/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 namespace test {
 
 class TestSessionStateDelegate : public SessionStateDelegate {
  public:
   TestSessionStateDelegate();
   virtual ~TestSessionStateDelegate();
 
   // 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(

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

nit: Replace email with user_id / UserId.

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

Again - I'd rather not since this is what it is. Let's discuss and I can still
change quickly after this has landed.

+      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;
 
   // Updates the internal state that indicates whether a session is in progress
   // and there is an active user. If |has_active_user| is |false|,
   // |active_user_session_started_| is reset to |false| as well (see below for
   // the difference between these two flags).
   void SetHasActiveUser(bool has_active_user);
 
   // Updates the internal state that indicates whether the session has been
   // fully started for the active user. If |active_user_session_started| is
   // |true|, |has_active_user_| is set to |true| as well (see below for the
@@ skipping 14 matching lines @@
   // complete and both profile and UI are fully available.
   bool active_user_session_started_;
 
   // Whether the screen can be locked. Locking will only actually be allowed
   // when this is |true| and there is an active user.
   bool can_lock_screen_;
 
   // Whether the screen is currently locked.
   bool screen_locked_;
 
+  // A test user image.
+  gfx::ImageSkia null_image_;
+
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_