| Index: ash/system/tray/system_tray.cc
|
| diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
|
| index 5526e3fde249a6e58a4a37b87acb710566d1ad9f..88f3c56e23d6b4794dbe78167112ce134aa89ef9 100644
|
| --- a/ash/system/tray/system_tray.cc
|
| +++ b/ash/system/tray/system_tray.cc
|
| @@ -165,19 +165,19 @@ 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();
|
| - for (int i = 0; i < maximum_user_profiles; i++)
|
| - AddTrayItem(new 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.
|
| - AddTrayItem(new TrayUserSeparator(this));
|
| - }
|
| -#endif
|
| +// #if !defined(OS_WIN)
|
| +// // Create user items for each possible user.
|
| +// int maximum_user_profiles =
|
| +// wm_shell->GetSessionStateDelegate()->GetMaximumNumberOfLoggedInUsers();
|
| +// for (int i = 0; i < maximum_user_profiles; i++)
|
| +// AddTrayItem(new 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.
|
| +// AddTrayItem(new TrayUserSeparator(this));
|
| +// }
|
| +// #endif
|
|
|
| tray_accessibility_ = new TrayAccessibility(this);
|
| tray_date_ = new TrayDate(this);
|
| @@ -190,21 +190,26 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
|
| AddTrayItem(new TrayIME(this));
|
| AddTrayItem(tray_accessibility_);
|
| AddTrayItem(new TrayTracing(this));
|
| - AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
|
| + //JAMES
|
| + //Check failed: g_power_status. PowerStatus::Get() called before Initialize().
|
| + // AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
|
| AddTrayItem(new TrayNetwork(this));
|
| AddTrayItem(new TrayVPN(this));
|
| AddTrayItem(new TraySms(this));
|
| AddTrayItem(new TrayBluetooth(this));
|
| tray_cast_ = new TrayCast(this);
|
| AddTrayItem(tray_cast_);
|
| - AddTrayItem(new TrayDisplay(this));
|
| + //JAMES uses ash::Shell
|
| + // AddTrayItem(new TrayDisplay(this));
|
| screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
|
| AddTrayItem(screen_capture_tray_item_);
|
| screen_share_tray_item_ = new ScreenShareTrayItem(this);
|
| AddTrayItem(screen_share_tray_item_);
|
| - AddTrayItem(new MultiProfileMediaTrayItem(this));
|
| + //JAMES crash in OnMediaCaptureChanged
|
| + // AddTrayItem(new MultiProfileMediaTrayItem(this));
|
| AddTrayItem(new TrayAudioChromeOs(this));
|
| - AddTrayItem(new TrayBrightness(this));
|
| + //JAMES uses ash::Shell
|
| + // AddTrayItem(new TrayBrightness(this));
|
| AddTrayItem(new TrayCapsLock(this));
|
| AddTrayItem(new TrayRotationLock(this));
|
| AddTrayItem(new TraySettings(this));
|
|
|