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

chrome/browser/ui/ash/session_state_delegate_chromeos.cc

 // 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.
 
 #include "chrome/browser/ui/ash/session_state_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 
+// TODO(skuhne): To be able to test this I had to hardcode the number of known
+// users. Get rid of it once it works.
+#define ADD_TEST_USER_ACCOUNTS_FOR_MULTI_USER_TEST_ENVIRONMENT 0

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

Why is this needed?

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

As stated - only for testing all the different menu states. Will be removed once
the menu is done (and / or I can add users through the usual means). Next CL and
it will be gone.

+
 SessionStateDelegate::SessionStateDelegate() {
 }
 
 SessionStateDelegate::~SessionStateDelegate() {
 }
 
-bool SessionStateDelegate::HasActiveUser() const {
-  return chromeos::UserManager::Get()->IsUserLoggedIn();
+int SessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const {
+  return 3;
+}
+
+int SessionStateDelegate::NumberOfLoggedInUsers() const {
+  return chromeos::UserManager::Get()->GetLoggedInUsers().size() +
+         ADD_TEST_USER_ACCOUNTS_FOR_MULTI_USER_TEST_ENVIRONMENT;
 }
 
 bool SessionStateDelegate::IsActiveUserSessionStarted() const {
   return chromeos::UserManager::Get()->IsSessionStarted();
 }
 
 bool SessionStateDelegate::CanLockScreen() const {
   return chromeos::UserManager::Get()->CanCurrentUserLock();
 }
 
 bool SessionStateDelegate::IsScreenLocked() const {
   return chromeos::ScreenLocker::default_screen_locker() &&
          chromeos::ScreenLocker::default_screen_locker()->locked();
 }
 
 void SessionStateDelegate::LockScreen() {
   if (!CanLockScreen())
     return;
 
   // TODO(antrim): Additional logging for http://crbug.com/173178.
   LOG(WARNING) << "Requesting screen lock from SessionStateDelegate";
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       RequestLockScreen();
 }
 
 void SessionStateDelegate::UnlockScreen() {
   // This is used only for testing thus far.
   NOTIMPLEMENTED();
 }
+
+const base::string16 SessionStateDelegate::GetUserDisplayName(
+    ash::MultiProfileIndex index) const {
+  if (ADD_TEST_USER_ACCOUNTS_FOR_MULTI_USER_TEST_ENVIRONMENT &&
+      static_cast<size_t>(index) >=
+          chromeos::UserManager::Get()->GetLoggedInUsers().size())
+    index = 0;

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

nit: Add {}

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

Done.

+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  return chromeos::UserManager::Get()->GetLRULoggedInUsers()[

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

nit: Makes sense to move method name to next line:

return chromeos::UserManager::Get()->
    GetLRULoggedInUsers()[index]->display_name();

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

Done.

+             index]->display_name();
+}
+
+const std::string SessionStateDelegate::GetUserEmail(
+    ash::MultiProfileIndex index) const {
+  if (ADD_TEST_USER_ACCOUNTS_FOR_MULTI_USER_TEST_ENVIRONMENT &&
+      static_cast<size_t>(index) >=
+          chromeos::UserManager::Get()->GetLoggedInUsers().size())
+    index = 0;
+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  return chromeos::UserManager::Get()->GetLRULoggedInUsers()[

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

nit: Same here.

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

Done.

+             index]->display_email();
+}
+
+const gfx::ImageSkia& SessionStateDelegate::GetUserImage(
+    ash::MultiProfileIndex index) const {
+  if (ADD_TEST_USER_ACCOUNTS_FOR_MULTI_USER_TEST_ENVIRONMENT &&

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

Makes sense to extract code that returns user by index to a separate method so
that these methods will become really simple like

const gfx::ImageSkia& SessionStateDelegate::GetUserImage(
    ash::MultiProfileIndex index) const {
  return GetUserByIndex(index)->image();
}

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

This is only for the lifetime of this CL. My next CL will remove this again.
Wait for it :). At the moment this code is "neutral" and will not do anything as
long as the define is 0.

+      static_cast<size_t>(index) >=
+          chromeos::UserManager::Get()->GetLoggedInUsers().size())
+    index = 0;
+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index]->image();
+}
+
+void SessionStateDelegate::GetLoggedInUsers(
+    ash::UserEmailList* users) {
+  const chromeos::UserList& logged_in_users =
+      chromeos::UserManager::Get()->GetLoggedInUsers();
+  for (chromeos::UserList::const_iterator it = logged_in_users.begin();
+       it != logged_in_users.end(); ++it) {
+    const chromeos::User* user = (*it);
+    users->push_back(user->email());
+  }
+}
+
+void SessionStateDelegate::SwitchActiveUser(const std::string& email) {
+  chromeos::UserManager::Get()->SwitchActiveUser(email);
+}