cros: Remove supervised user methods from SystemTrayDelegate

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 "components/signin/public/interfaces/account_id.mojom";
 import "ui/gfx/image/mojo/image.mojom";
 
 // Matches session_manager::SessionState.
@@ skipping 53 matching lines @@
   // 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.
+// 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;
 
+  // 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.
   // Usually true after login, but can be false for specialized user sessions
   // (e.g. adding supervised users).
   bool should_enable_settings;
 
   // Similar to |should_show_settings| but for the notification tray.
   bool should_show_notification_tray;
 };
 
 // Matches ash::AddUserSessionPolicy.
@@ skipping 67 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);
 };