Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

Index: trunk/src/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/session_state_delegate_chromeos.cc	(revision 267249)
+++ trunk/src/chrome/browser/ui/ash/session_state_delegate_chromeos.cc	(working copy)
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
 
 #include "ash/multi_profile_uma.h"
-#include "ash/session/session_state_observer.h"
+#include "ash/session_state_observer.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ -132,21 +132,44 @@
   return session_state_;
 }
 
-const ash::UserInfo* SessionStateDelegateChromeos::GetUserInfo(
+const base::string16 SessionStateDelegateChromeos::GetUserDisplayName(
     ash::MultiProfileIndex index) const {
   DCHECK_LT(index, NumberOfLoggedInUsers());
-  return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index];
+  return chromeos::UserManager::Get()->
+             GetLRULoggedInUsers()[index]->display_name();
 }
 
-const ash::UserInfo* SessionStateDelegateChromeos::GetUserInfo(
+const base::string16 SessionStateDelegateChromeos::GetUserGivenName(
+    ash::MultiProfileIndex index) const {
+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  return chromeos::UserManager::Get()
+      ->GetLRULoggedInUsers()[index]
+      ->given_name();
+}
+
+const std::string SessionStateDelegateChromeos::GetUserEmail(
+    ash::MultiProfileIndex index) const {
+  DCHECK_LT(index, NumberOfLoggedInUsers());
+  return chromeos::UserManager::Get()->
+             GetLRULoggedInUsers()[index]->display_email();
+}
+
+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(
     content::BrowserContext* context) const {
   DCHECK(context);
   return chromeos::UserManager::Get()->GetUserByProfile(
-      Profile::FromBrowserContext(context));
+      Profile::FromBrowserContext(context))->image();
 }
 
-bool SessionStateDelegateChromeos::ShouldShowAvatar(
-    aura::Window* window) const {
+bool SessionStateDelegateChromeos::ShouldShowAvatar(aura::Window* window) {
   return chrome::MultiUserWindowManager::GetInstance()->
       ShouldShowAvatar(window);
 }