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

ash/public/interfaces/session_controller.mojom

 // 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.
 
 module ash.mojom;
 
+import "ash/public/interfaces/user_info.mojom";
 import "components/signin/public/interfaces/account_id.mojom";
-import "ui/gfx/image/mojo/image.mojom";
 
 // Matches session_manager::SessionState.
 enum SessionState {
   // Default value, when session state hasn't been initialized yet.
   UNKNOWN,
 
   // Running out of box UI.
   OOBE,
 
   // Running login UI (primary user) but user sign in hasn't completed yet.
@@ skipping 11 matching lines @@
   ACTIVE,
 
   // The session screen is locked.
   LOCKED,
 
   // Same as SESSION_STATE_LOGIN_PRIMARY but for multi-profiles sign in i.e.
   // when there's at least one user already active in the session.
   LOGIN_SECONDARY,
 };
 
-// Matches user_manager::UserType.
-enum UserType {
-  // Regular user, has a user name and password.
-  REGULAR,
-
-  // Guest user, logs in without authentication.
-  GUEST,
-
-  // Public account user, logs in without authentication. Available only if
-  // enabled through policy.
-  PUBLIC_ACCOUNT,
-
-  // Supervised user, logs in only with local authentication.
-  SUPERVISED,
-
-  // Kiosk app robot, logs in without authentication.
-  KIOSK,
-
-  // Child user, with supervised options.
-  CHILD,
-
-  // Android app in kiosk mode, logs in without authentication.
-  ARC_KIOSK,
-
-  // Active Directory user. Authenticates against Active Directory server.
-  ACTIVE_DIRECTORY,
-};
-
 // Matches ash::CycleUserDirection.
 enum CycleUserDirection {
   NEXT,  // Cycle to the next user.
   PREVIOUS,  // Cycle to the previous user.
 };
 
 // Info about a user session in ash. May be sent repeatedly for a single user
 // because individual fields may change (e.g. the avatar image or custodians).
 struct UserSession {
   // A user session id for the user session. It is generated by session manager
   // (chrome) when a user session starts and never changes during the lifetime
   // of the session manager. The number starts at 1 for the first user session
   // and incremented by one for each subsequent user session.
   uint32 session_id;
 
-  UserType type;
-  signin.mojom.AccountId account_id;
-  string display_name;
-  string display_email;
-  gfx.mojom.ImageSkia avatar;
+  // Contains general user information state, like the account id, display name,
+  // and avatar.
+  UserInfo user_info;
 
   // For supervised users only, the email address of the custodian account.
   // Empty for non-supervised users. Available after profile is loaded.
   string custodian_email;
 
   // For supervised users only, the email address of the second custodian
   // account, if any. Available after profile is loaded.
   string second_custodian_email;
 
   // Whether the settings icon should be enabled in the system tray menu.
@@ skipping 80 matching lines @@
   // Requests to lock screen.
   RequestLockScreen();
 
   // Switch to the active user with |account_id| (if the user has already signed
   // in).
   SwitchActiveUser(signin.mojom.AccountId account_id);
 
   // Switch the active user to the next or previous user.
   CycleActiveUser(CycleUserDirection direction);
 };