cros: Remove supervised user methods from SystemTrayDelegate

ash/system/tray/system_tray.cc

 // 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.
 
 #include "ash/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 238 matching lines @@
 
   // Crucially, this trailing padding has to be inside the user item(s).
   // Otherwise it could be a main axis margin on the tray's box layout.
   AddTrayItem(base::MakeUnique<PaddingTrayItem>());
 
   tray_accessibility_ = new TrayAccessibility(this);
   tray_update_ = new TrayUpdate(this);
 
   AddTrayItem(base::MakeUnique<TraySessionLengthLimit>(this));
   AddTrayItem(base::MakeUnique<TrayEnterprise>(this));
-  AddTrayItem(base::MakeUnique<TraySupervisedUser>(this));
+  tray_supervised_user_ = new TraySupervisedUser(this);
+  AddTrayItem(base::WrapUnique(tray_supervised_user_));
   AddTrayItem(base::MakeUnique<TrayIME>(this));
   AddTrayItem(base::WrapUnique(tray_accessibility_));
   AddTrayItem(base::MakeUnique<TrayTracing>(this));
   AddTrayItem(
       base::MakeUnique<TrayPower>(this, message_center::MessageCenter::Get()));
   tray_network_ = new TrayNetwork(this);
   AddTrayItem(base::WrapUnique(tray_network_));
   AddTrayItem(base::MakeUnique<TrayVPN>(this));
   AddTrayItem(base::MakeUnique<TrayBluetooth>(this));
   tray_cast_ = new TrayCast(this);
@@ skipping 27 matching lines @@
   items_.push_back(std::move(item));
 
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   views::View* tray_item =
       item_ptr->CreateTrayView(delegate->GetUserLoginStatus());
   item_ptr->UpdateAfterShelfAlignmentChange();
 
   if (tray_item) {
     tray_container()->AddChildViewAt(tray_item, 0);
     PreferredSizeChanged();
-    tray_item_map_[item_ptr] = tray_item;
   }
 }
 
 std::vector<SystemTrayItem*> SystemTray::GetTrayItems() const {
   std::vector<SystemTrayItem*> result;
   for (const auto& item : items_)
     result.push_back(item.get());
   return result;
 }
 
@@ skipping 287 matching lines @@
   WmWindow::Get(anchor_widget->GetNativeWindow())
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           bubble_widget, kShellWindowId_SettingBubbleContainer, params);
 }
 
 void SystemTray::HideBubble(const TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
-views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) {
-  std::map<SystemTrayItem*, views::View*>::iterator it =
-      tray_item_map_.find(item);
-  return it == tray_item_map_.end() ? NULL : it->second;
-}
-
 TrayCast* SystemTray::GetTrayCastForTesting() const {
   return tray_cast_;
 }
 
 TrayNetwork* SystemTray::GetTrayNetworkForTesting() const {
   return tray_network_;
 }
 
+TraySupervisedUser* SystemTray::GetTraySupervisedUserForTesting() const {
+  return tray_supervised_user_;
+}
+
 TraySystemInfo* SystemTray::GetTraySystemInfoForTesting() const {
   return tray_system_info_;
 }
 
 TrayTiles* SystemTray::GetTrayTilesForTesting() const {
   return tray_tiles_;
 }
 
 void SystemTray::CloseBubble(const ui::KeyEvent& key_event) {
   CloseSystemBubble();
@@ skipping 84 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash