| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/system/tray/system_tray.h" | 5 #include "ash/common/system/tray/system_tray.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
| 8 #include "ash/common/login_status.h" | 8 #include "ash/common/login_status.h" |
| 9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 WmShell* wm_shell = WmShell::Get(); | 165 WmShell* wm_shell = WmShell::Get(); |
| 166 #if !defined(OS_WIN) | 166 #if !defined(OS_WIN) |
| 167 // Create user items for each possible user. | 167 // Create user items for each possible user. |
| 168 int maximum_user_profiles = | 168 int maximum_user_profiles = |
| 169 wm_shell->GetSessionStateDelegate()->GetMaximumNumberOfLoggedInUsers(); | 169 wm_shell->GetSessionStateDelegate()->GetMaximumNumberOfLoggedInUsers(); |
| 170 for (int i = 0; i < maximum_user_profiles; i++) | 170 for (int i = 0; i < maximum_user_profiles; i++) |
| 171 AddTrayItem(new TrayUser(this, i)); | 171 AddTrayItem(new TrayUser(this, i)); |
| 172 | 172 |
| 173 if (maximum_user_profiles > 1) { | 173 if (maximum_user_profiles > 1) { |
| 174 // Add a special double line separator between users and the rest of the | 174 // Add a special double line separator between users and the rest of the |
| 175 // menu if more then one user is logged in. | 175 // menu if more than one user is logged in. |
| 176 AddTrayItem(new TrayUserSeparator(this)); | 176 AddTrayItem(new TrayUserSeparator(this)); |
| 177 } | 177 } |
| 178 #endif | 178 #endif |
| 179 | 179 |
| 180 tray_accessibility_ = new TrayAccessibility(this); | 180 tray_accessibility_ = new TrayAccessibility(this); |
| 181 tray_date_ = new TrayDate(this); | 181 tray_date_ = new TrayDate(this); |
| 182 tray_update_ = new TrayUpdate(this); | 182 tray_update_ = new TrayUpdate(this); |
| 183 | 183 |
| 184 #if defined(OS_CHROMEOS) | 184 #if defined(OS_CHROMEOS) |
| 185 AddTrayItem(new TraySessionLengthLimit(this)); | 185 AddTrayItem(new TraySessionLengthLimit(this)); |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 .work_area() | 767 .work_area() |
| 768 .height(); | 768 .height(); |
| 769 if (work_area_height > 0) { | 769 if (work_area_height > 0) { |
| 770 UMA_HISTOGRAM_CUSTOM_COUNTS( | 770 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 771 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 771 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
| 772 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 772 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
| 773 } | 773 } |
| 774 } | 774 } |
| 775 | 775 |
| 776 } // namespace ash | 776 } // namespace ash |
| OLD | NEW |