| Index: ash/system/tray/system_tray.cc
|
| diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
|
| index ebb5e68a82797030feaa6920f6b8d4f3856988e9..0bb523d5fff404092cffa07c5e574b61ce919f7c 100644
|
| --- a/ash/system/tray/system_tray.cc
|
| +++ b/ash/system/tray/system_tray.cc
|
| @@ -164,11 +164,9 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
|
| ash::Shell* shell = ash::Shell::GetInstance();
|
| int maximum_user_profiles =
|
| shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers();
|
| - for (int i = 0; i < maximum_user_profiles; i++) {
|
| - internal::TrayUser* tray_user = new internal::TrayUser(this, i);
|
| - AddTrayItem(tray_user);
|
| - user_items_.push_back(tray_user);
|
| - }
|
| + for (int i = 0; i < maximum_user_profiles; i++)
|
| + AddTrayItem(new internal::TrayUser(this, i));
|
| +
|
| if (maximum_user_profiles > 1) {
|
| // Add a special double line separator between users and the rest of the
|
| // menu if more then one user is logged in.
|
| @@ -241,10 +239,6 @@ const std::vector<SystemTrayItem*>& SystemTray::GetTrayItems() const {
|
| return items_.get();
|
| }
|
|
|
| -const std::vector<internal::TrayUser*>& SystemTray::GetTrayUserItems() const {
|
| - return user_items_;
|
| -}
|
| -
|
| void SystemTray::ShowDefaultView(BubbleCreationType creation_type) {
|
| ShowDefaultViewWithOffset(
|
| creation_type,
|
| @@ -686,11 +680,6 @@ views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) {
|
| return it == tray_item_map_.end() ? NULL : it->second;
|
| }
|
|
|
| -void SystemTray::AddTrayUserItemForTest(internal::TrayUser* tray_user) {
|
| - AddTrayItem(tray_user);
|
| - user_items_.push_back(tray_user);
|
| -}
|
| -
|
| internal::TrayDate* SystemTray::GetTrayDateForTesting() const {
|
| return tray_date_;
|
| }
|
|
|