CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

chrome/browser/ui/views/frame/system_menu_model_builder.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/views/frame/system_menu_model_builder.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/generated_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/models/simple_menu_model.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
 SystemMenuModelBuilder::SystemMenuModelBuilder(
     ui::AcceleratorProvider* provider,
     Browser* browser)
@@ skipping 114 matching lines @@
       chrome::MultiUserWindowManager::GetInstance();
   const std::string user_id =
       multi_user_util::GetUserIDFromProfile(browser()->profile());
   aura::Window* window = browser()->window()->GetNativeWindow();
   if (user_id.empty() || !window || manager->GetWindowOwner(window).empty())
     return;
 
   model->AddSeparator(ui::NORMAL_SEPARATOR);
   DCHECK(logged_in_users <= 3);
   for (int user_index = 1; user_index < logged_in_users; ++user_index) {
+    const ash::UserInfo* user_info = delegate->GetUserInfo(user_index);
     model->AddItem(
-        user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2 :
-                          IDC_VISIT_DESKTOP_OF_LRU_USER_3,
-        l10n_util::GetStringFUTF16(
-            IDS_VISIT_DESKTOP_OF_LRU_USER,
-            delegate->GetUserDisplayName(user_index),
-            base::ASCIIToUTF16(delegate->GetUserEmail(user_index))));
+        user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2
+                        : IDC_VISIT_DESKTOP_OF_LRU_USER_3,
+        l10n_util::GetStringFUTF16(IDS_VISIT_DESKTOP_OF_LRU_USER,
+                                   user_info->GetDisplayName(),
+                                   base::ASCIIToUTF16(user_info->GetEmail())));
   }
 #endif
 }