cros: Pull user info from session_controller_client.mojom into separate mojom.

chrome/browser/ui/ash/session_controller_client.cc

 // Copyright 2016 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_controller_client.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/public/cpp/session_types.h"
@@ skipping 50 matching lines @@
 
 // Creates a mojom::UserSession for the given user. Returns nullptr if there is
 // no user session started for the given user.
 ash::mojom::UserSessionPtr UserToUserSession(const User& user) {
   const uint32_t user_session_id = GetSessionId(user);
   if (user_session_id == 0u)
     return nullptr;
 
   ash::mojom::UserSessionPtr session = ash::mojom::UserSession::New();
   session->session_id = user_session_id;
-  session->type = user.GetType();
-  session->account_id = user.GetAccountId();
-  session->display_name = base::UTF16ToUTF8(user.display_name());
-  session->display_email = user.display_email();
+  session->user_info = ash::mojom::UserInfo::New();
+  session->user_info->type = user.GetType();
+  session->user_info->account_id = user.GetAccountId();
+  session->user_info->display_name = base::UTF16ToUTF8(user.display_name());
+  session->user_info->display_email = user.display_email();
 
-  session->avatar = user.GetImage();
-  if (session->avatar.isNull()) {
-    session->avatar = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-        IDR_PROFILE_PICTURE_LOADING);
+  session->user_info->avatar = user.GetImage();
+  if (session->user_info->avatar.isNull()) {
+    session->user_info->avatar =
+        *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_PROFILE_PICTURE_LOADING);
   }
 
   if (user.IsSupervised()) {
     Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(&user);
     if (profile) {
       SupervisedUserService* service =
           SupervisedUserServiceFactory::GetForProfile(profile);
       session->custodian_email = service->GetCustodianEmailAddress();
       session->second_custodian_email =
           service->GetSecondCustodianEmailAddress();
@@ skipping 361 matching lines @@
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers()) {
     const uint32_t user_session_id = GetSessionId(*user);
     DCHECK_NE(0u, user_session_id);
     user_session_ids.push_back(user_session_id);
   }
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }