| Index: ash/common/system/tray/system_tray.cc
|
| diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
|
| index d8930080cb33bc1b0f3e4182a686b82349171fa7..1e5537cb001743e780253873e3a3ed57ada7e6fc 100644
|
| --- a/ash/common/system/tray/system_tray.cc
|
| +++ b/ash/common/system/tray/system_tray.cc
|
| @@ -210,11 +210,11 @@ void SystemTray::Shutdown() {
|
| }
|
|
|
| void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
|
| - WmShell* wm_shell = WmShell::Get();
|
| #if !defined(OS_WIN)
|
| // Create user items for each possible user.
|
| - int maximum_user_profiles =
|
| - wm_shell->GetSessionStateDelegate()->GetMaximumNumberOfLoggedInUsers();
|
| + int maximum_user_profiles = WmShell::Get()
|
| + ->GetSessionStateDelegate()
|
| + ->GetMaximumNumberOfLoggedInUsers();
|
| for (int i = 0; i < maximum_user_profiles; i++)
|
| AddTrayItem(new TrayUser(this, i));
|
|
|
| @@ -266,8 +266,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
|
| AddTrayItem(tray_update_);
|
| AddTrayItem(tray_date_);
|
| #endif
|
| -
|
| - SetVisible(wm_shell->system_tray_delegate()->GetTrayVisibilityOnStartup());
|
| }
|
|
|
| void SystemTray::AddTrayItem(SystemTrayItem* item) {
|
|
|