Move avatar holder code to ash

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_chromeos.h"
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session_state_observer.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 SessionStateDelegateChromeos::SessionStateDelegateChromeos() {
   chromeos::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 SessionStateDelegateChromeos::~SessionStateDelegateChromeos() {
 }
 
+content::BrowserContext* SessionStateDelegateChromeos::GetBrowserContextByIndex(
+    ash::MultiProfileIndex index) {
+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  chromeos::User* user =
+      chromeos::UserManager::Get()->GetLRULoggedInUsers()[index];
+  DCHECK(user);
+  return chromeos::UserManager::Get()->GetProfileByUser(user);
+}
+
 int SessionStateDelegateChromeos::GetMaximumNumberOfLoggedInUsers() const {
   // We limit list of logged in users to 10 due to memory constraints.
   // Note that 10 seems excessive, but we want to test how many users are
   // actually added to a session.
   // TODO(nkostylev): Adjust this limitation based on device capabilites.
   // http://crbug.com/230865
   return 10;
 }
 
 int SessionStateDelegateChromeos::NumberOfLoggedInUsers() const {
@@ skipping 66 matching lines @@
 
 const std::string SessionStateDelegateChromeos::GetUserID(
     ash::MultiProfileIndex index) const {
   DCHECK_LT(index, NumberOfLoggedInUsers());
   return gaia::CanonicalizeEmail(gaia::SanitizeEmail(
       chromeos::UserManager::Get()->
              GetLRULoggedInUsers()[index]->email()));
 }
 
 const gfx::ImageSkia& SessionStateDelegateChromeos::GetUserImage(
-    ash::MultiProfileIndex index) const {
-  DCHECK_LT(index, NumberOfLoggedInUsers());
-  return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index]->image();
+    content::BrowserContext* context) const {
+  DCHECK(context);
+  return chromeos::UserManager::Get()->GetUserByProfile(
+      Profile::FromBrowserContext(context))->image();
 }
 
-void SessionStateDelegateChromeos::GetLoggedInUsers(ash::UserIdList* 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());
-  }
+bool SessionStateDelegateChromeos::ShouldShowAvatar(aura::Window* window) {
+  return chrome::MultiUserWindowManager::GetInstance()->
+      ShouldShowAvatar(window);
 }
 
 void SessionStateDelegateChromeos::SwitchActiveUser(
     const std::string& user_id) {
   // Disallow switching to an already active user since that might crash.
   // Also check that we got a user id and not an email address.
   DCHECK_EQ(user_id,
             gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_id)));
   if (user_id == chromeos::UserManager::Get()->GetActiveUser()->email())
     return;
@@ skipping 58 matching lines @@
                     session_state_observer_list_,
                     ActiveUserChanged(active_user->email()));
 }
 
 void SessionStateDelegateChromeos::UserAddedToSession(
     const chromeos::User* added_user) {
   FOR_EACH_OBSERVER(ash::SessionStateObserver,
                     session_state_observer_list_,
                     UserAddedToSession(added_user->email()));
 }