cros: Remove supervised user methods from SystemTrayDelegate

ash/system/tray/system_tray.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 10 matching lines @@
 class KeyEventWatcher;
 enum class LoginStatus;
 class ScreenTrayItem;
 class SystemBubbleWrapper;
 class SystemTrayDelegate;
 class SystemTrayItem;
 class TrayAccessibility;
 class TrayAudio;
 class TrayCast;
 class TrayNetwork;
+class TraySupervisedUser;
 class TraySystemInfo;
 class TrayTiles;
 class TrayUpdate;
 class WebNotificationTray;
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
@@ skipping 92 matching lines @@
       views::Widget::InitParams* params) const override;
   void HideBubble(const views::TrayBubbleView* bubble_view) override;
 
   ScreenTrayItem* GetScreenShareItem() { return screen_share_tray_item_; }
   ScreenTrayItem* GetScreenCaptureItem() { return screen_capture_tray_item_; }
 
   TrayAccessibility* GetTrayAccessibilityForTest() {
     return tray_accessibility_;
   }
 
-  // Get the tray item view (or NULL) for a given |tray_item| in a unit test.
-  views::View* GetTrayItemViewForTest(SystemTrayItem* tray_item);
-
   TrayCast* GetTrayCastForTesting() const;
   TrayNetwork* GetTrayNetworkForTesting() const;
+  TraySupervisedUser* GetTraySupervisedUserForTesting() const;
   TraySystemInfo* GetTraySystemInfoForTesting() const;
   TrayTiles* GetTrayTilesForTesting() const;
 
   // Activates the system tray bubble.
   void ActivateBubble();
 
  private:
   class ActivationObserver;
 
   // Closes the bubble. Used to bind as a KeyEventWatcher::KeyEventCallback.
@@ skipping 45 matching lines @@
 
   // The web notification tray view that appears adjacent to this view.
   WebNotificationTray* web_notification_tray_ = nullptr;
 
   // Items.
   std::vector<std::unique_ptr<SystemTrayItem>> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_ = nullptr;
 
-  // Mappings of system tray item and it's view in the tray.
-  std::map<SystemTrayItem*, views::View*> tray_item_map_;
-
   // Bubble for default and detailed views.
   std::unique_ptr<SystemBubbleWrapper> system_bubble_;
 
   // Keep track of the default view height so that when we create detailed
   // views directly (e.g. from a notification) we know what height to use.
   int default_bubble_height_ = 0;
 
   // This is true when the displayed system tray menu is a full tray menu,
   // otherwise a single line item menu like the volume slider is shown.
   // Note that the value is only valid when |system_bubble_| is true.
   bool full_system_tray_menu_ = false;
 
   // These objects are not owned by this class.
   TrayAccessibility* tray_accessibility_ = nullptr;
   TrayAudio* tray_audio_ = nullptr;  // May be null.
   TrayCast* tray_cast_ = nullptr;
   TrayNetwork* tray_network_ = nullptr;
   TrayTiles* tray_tiles_ = nullptr;
+  TraySupervisedUser* tray_supervised_user_ = nullptr;
   TraySystemInfo* tray_system_info_ = nullptr;
   TrayUpdate* tray_update_ = nullptr;
 
   // A reference to the Screen share and capture item.
   ScreenTrayItem* screen_capture_tray_item_ = nullptr;  // not owned
   ScreenTrayItem* screen_share_tray_item_ = nullptr;    // not owned
 
   std::unique_ptr<KeyEventWatcher> key_event_watcher_;
 
   std::unique_ptr<ActivationObserver> activation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_