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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell/panel_window.h" | 10 #include "ash/shell/panel_window.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "ui/gfx/skia_util.h" | 42 #include "ui/gfx/skia_util.h" |
43 #include "ui/views/border.h" | 43 #include "ui/views/border.h" |
44 #include "ui/views/controls/label.h" | 44 #include "ui/views/controls/label.h" |
45 #include "ui/views/layout/box_layout.h" | 45 #include "ui/views/layout/box_layout.h" |
46 #include "ui/views/layout/fill_layout.h" | 46 #include "ui/views/layout/fill_layout.h" |
47 #include "ui/views/view.h" | 47 #include "ui/views/view.h" |
48 | 48 |
49 #if defined(OS_CHROMEOS) | 49 #if defined(OS_CHROMEOS) |
50 #include "ash/system/chromeos/audio/tray_audio.h" | 50 #include "ash/system/chromeos/audio/tray_audio.h" |
51 #include "ash/system/chromeos/brightness/tray_brightness.h" | 51 #include "ash/system/chromeos/brightness/tray_brightness.h" |
52 #include "ash/system/chromeos/drive/tray_drive_notice.h" | |
53 #include "ash/system/chromeos/enterprise/tray_enterprise.h" | 52 #include "ash/system/chromeos/enterprise/tray_enterprise.h" |
54 #include "ash/system/chromeos/managed/tray_locally_managed_user.h" | 53 #include "ash/system/chromeos/managed/tray_locally_managed_user.h" |
55 #include "ash/system/chromeos/network/tray_network.h" | 54 #include "ash/system/chromeos/network/tray_network.h" |
56 #include "ash/system/chromeos/network/tray_sms.h" | 55 #include "ash/system/chromeos/network/tray_sms.h" |
57 #include "ash/system/chromeos/network/tray_vpn.h" | 56 #include "ash/system/chromeos/network/tray_vpn.h" |
58 #include "ash/system/chromeos/power/tray_power.h" | 57 #include "ash/system/chromeos/power/tray_power.h" |
59 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" | 58 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" |
60 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" | 59 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" |
61 #include "ash/system/chromeos/settings/tray_settings.h" | 60 #include "ash/system/chromeos/settings/tray_settings.h" |
62 #include "ash/system/chromeos/tray_display.h" | 61 #include "ash/system/chromeos/tray_display.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 // menu if more then one user is logged in. | 174 // menu if more then one user is logged in. |
176 AddTrayItem(new internal::TrayUserSeparator(this)); | 175 AddTrayItem(new internal::TrayUserSeparator(this)); |
177 } | 176 } |
178 #endif | 177 #endif |
179 | 178 |
180 tray_accessibility_ = new internal::TrayAccessibility(this); | 179 tray_accessibility_ = new internal::TrayAccessibility(this); |
181 tray_date_ = new internal::TrayDate(this); | 180 tray_date_ = new internal::TrayDate(this); |
182 | 181 |
183 #if defined(OS_CHROMEOS) | 182 #if defined(OS_CHROMEOS) |
184 AddTrayItem(new internal::TrayEnterprise(this)); | 183 AddTrayItem(new internal::TrayEnterprise(this)); |
185 AddTrayItem(new internal::TrayDriveNotice(this)); | |
186 AddTrayItem(new internal::TrayLocallyManagedUser(this)); | 184 AddTrayItem(new internal::TrayLocallyManagedUser(this)); |
187 AddTrayItem(new internal::TrayIME(this)); | 185 AddTrayItem(new internal::TrayIME(this)); |
188 AddTrayItem(tray_accessibility_); | 186 AddTrayItem(tray_accessibility_); |
189 AddTrayItem(new internal::TrayTracing(this)); | 187 AddTrayItem(new internal::TrayTracing(this)); |
190 AddTrayItem( | 188 AddTrayItem( |
191 new internal::TrayPower(this, message_center::MessageCenter::Get())); | 189 new internal::TrayPower(this, message_center::MessageCenter::Get())); |
192 AddTrayItem(new internal::TrayNetwork(this)); | 190 AddTrayItem(new internal::TrayNetwork(this)); |
193 AddTrayItem(new internal::TrayVPN(this)); | 191 AddTrayItem(new internal::TrayVPN(this)); |
194 AddTrayItem(new internal::TraySms(this)); | 192 AddTrayItem(new internal::TraySms(this)); |
195 AddTrayItem(new internal::TrayBluetooth(this)); | 193 AddTrayItem(new internal::TrayBluetooth(this)); |
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
719 system_bubble_.reset(); | 717 system_bubble_.reset(); |
720 // When closing a system bubble with the alternate shelf layout, we need to | 718 // When closing a system bubble with the alternate shelf layout, we need to |
721 // turn off the active tinting of the shelf. | 719 // turn off the active tinting of the shelf. |
722 if (full_system_tray_menu_) { | 720 if (full_system_tray_menu_) { |
723 SetDrawBackgroundAsActive(false); | 721 SetDrawBackgroundAsActive(false); |
724 full_system_tray_menu_ = false; | 722 full_system_tray_menu_ = false; |
725 } | 723 } |
726 } | 724 } |
727 | 725 |
728 } // namespace ash | 726 } // namespace ash |
OLD | NEW |