Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: chrome/browser/ui/ash/session_controller_client.cc

Issue 2911493002: cros: Pull user info from session_controller_client.mojom into separate mojom. (Closed)
Patch Set: Fix ordering in typemaps Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/session_controller_client.cc
diff --git a/chrome/browser/ui/ash/session_controller_client.cc b/chrome/browser/ui/ash/session_controller_client.cc
index 96b2ab5ed037968162f884f0c96ee81aa8912970..6d3f0ac59948df265688eaffc95f34b0adffcb7e 100644
--- a/chrome/browser/ui/ash/session_controller_client.cc
+++ b/chrome/browser/ui/ash/session_controller_client.cc
@@ -68,15 +68,17 @@ ash::mojom::UserSessionPtr UserToUserSession(const User& user) {
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->avatar = user.GetImage();
- if (session->avatar.isNull()) {
- session->avatar = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- IDR_PROFILE_PICTURE_LOADING);
+ 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->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()) {
« no previous file with comments | « ash/test/test_session_controller_client.cc ('k') | chrome/browser/ui/ash/session_controller_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698