| 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/metrics/user_metrics_recorder.h" | 8 #include "ash/metrics/user_metrics_recorder.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell/panel_window.h" | 11 #include "ash/shell/panel_window.h" |
| 12 #include "ash/shell_window_ids.h" | 12 #include "ash/shell_window_ids.h" |
| 13 #include "ash/system/audio/tray_audio.h" |
| 13 #include "ash/system/bluetooth/tray_bluetooth.h" | 14 #include "ash/system/bluetooth/tray_bluetooth.h" |
| 14 #include "ash/system/date/tray_date.h" | 15 #include "ash/system/date/tray_date.h" |
| 15 #include "ash/system/drive/tray_drive.h" | 16 #include "ash/system/drive/tray_drive.h" |
| 16 #include "ash/system/ime/tray_ime.h" | 17 #include "ash/system/ime/tray_ime.h" |
| 17 #include "ash/system/monitor/tray_monitor.h" | 18 #include "ash/system/monitor/tray_monitor.h" |
| 18 #include "ash/system/session_length_limit/tray_session_length_limit.h" | 19 #include "ash/system/session_length_limit/tray_session_length_limit.h" |
| 19 #include "ash/system/status_area_widget.h" | 20 #include "ash/system/status_area_widget.h" |
| 20 #include "ash/system/tray/system_tray_delegate.h" | 21 #include "ash/system/tray/system_tray_delegate.h" |
| 21 #include "ash/system/tray/system_tray_item.h" | 22 #include "ash/system/tray/system_tray_item.h" |
| 22 #include "ash/system/tray/tray_bubble_wrapper.h" | 23 #include "ash/system/tray/tray_bubble_wrapper.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 40 #include "ui/gfx/canvas.h" | 41 #include "ui/gfx/canvas.h" |
| 41 #include "ui/gfx/screen.h" | 42 #include "ui/gfx/screen.h" |
| 42 #include "ui/gfx/skia_util.h" | 43 #include "ui/gfx/skia_util.h" |
| 43 #include "ui/views/border.h" | 44 #include "ui/views/border.h" |
| 44 #include "ui/views/controls/label.h" | 45 #include "ui/views/controls/label.h" |
| 45 #include "ui/views/layout/box_layout.h" | 46 #include "ui/views/layout/box_layout.h" |
| 46 #include "ui/views/layout/fill_layout.h" | 47 #include "ui/views/layout/fill_layout.h" |
| 47 #include "ui/views/view.h" | 48 #include "ui/views/view.h" |
| 48 | 49 |
| 49 #if defined(OS_CHROMEOS) | 50 #if defined(OS_CHROMEOS) |
| 50 #include "ash/system/chromeos/audio/tray_audio.h" | 51 #include "ash/system/chromeos/audio/tray_audio_chromeos.h" |
| 52 #include "ash/system/chromeos/audio/tray_audio_delegate_chromeos.h" |
| 51 #include "ash/system/chromeos/brightness/tray_brightness.h" | 53 #include "ash/system/chromeos/brightness/tray_brightness.h" |
| 52 #include "ash/system/chromeos/enterprise/tray_enterprise.h" | 54 #include "ash/system/chromeos/enterprise/tray_enterprise.h" |
| 53 #include "ash/system/chromeos/managed/tray_locally_managed_user.h" | 55 #include "ash/system/chromeos/managed/tray_locally_managed_user.h" |
| 54 #include "ash/system/chromeos/network/tray_network.h" | 56 #include "ash/system/chromeos/network/tray_network.h" |
| 55 #include "ash/system/chromeos/network/tray_sms.h" | 57 #include "ash/system/chromeos/network/tray_sms.h" |
| 56 #include "ash/system/chromeos/network/tray_vpn.h" | 58 #include "ash/system/chromeos/network/tray_vpn.h" |
| 57 #include "ash/system/chromeos/power/tray_power.h" | 59 #include "ash/system/chromeos/power/tray_power.h" |
| 58 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" | 60 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" |
| 59 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" | 61 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" |
| 60 #include "ash/system/chromeos/settings/tray_settings.h" | 62 #include "ash/system/chromeos/settings/tray_settings.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 AddTrayItem( | 190 AddTrayItem( |
| 189 new internal::TrayPower(this, message_center::MessageCenter::Get())); | 191 new internal::TrayPower(this, message_center::MessageCenter::Get())); |
| 190 AddTrayItem(new internal::TrayNetwork(this)); | 192 AddTrayItem(new internal::TrayNetwork(this)); |
| 191 AddTrayItem(new internal::TrayVPN(this)); | 193 AddTrayItem(new internal::TrayVPN(this)); |
| 192 AddTrayItem(new internal::TraySms(this)); | 194 AddTrayItem(new internal::TraySms(this)); |
| 193 AddTrayItem(new internal::TrayBluetooth(this)); | 195 AddTrayItem(new internal::TrayBluetooth(this)); |
| 194 AddTrayItem(new internal::TrayDrive(this)); | 196 AddTrayItem(new internal::TrayDrive(this)); |
| 195 AddTrayItem(new internal::TrayDisplay(this)); | 197 AddTrayItem(new internal::TrayDisplay(this)); |
| 196 AddTrayItem(new internal::ScreenCaptureTrayItem(this)); | 198 AddTrayItem(new internal::ScreenCaptureTrayItem(this)); |
| 197 AddTrayItem(new internal::ScreenShareTrayItem(this)); | 199 AddTrayItem(new internal::ScreenShareTrayItem(this)); |
| 198 AddTrayItem(new internal::TrayAudio(this)); | 200 AddTrayItem( |
| 201 new internal::TrayAudioChromeOs(this, |
| 202 new system::TrayAudioDelegateChromeOs())); |
| 199 AddTrayItem(new internal::TrayBrightness(this)); | 203 AddTrayItem(new internal::TrayBrightness(this)); |
| 200 AddTrayItem(new internal::TrayCapsLock(this)); | 204 AddTrayItem(new internal::TrayCapsLock(this)); |
| 201 AddTrayItem(new internal::TraySettings(this)); | 205 AddTrayItem(new internal::TraySettings(this)); |
| 202 AddTrayItem(new internal::TrayUpdate(this)); | 206 AddTrayItem(new internal::TrayUpdate(this)); |
| 203 AddTrayItem(tray_date_); | 207 AddTrayItem(tray_date_); |
| 204 #elif defined(OS_WIN) | 208 #elif defined(OS_WIN) |
| 205 AddTrayItem(tray_accessibility_); | 209 AddTrayItem(tray_accessibility_); |
| 206 AddTrayItem(new internal::TrayUpdate(this)); | 210 AddTrayItem(new internal::TrayUpdate(this)); |
| 207 AddTrayItem(tray_date_); | 211 AddTrayItem(tray_date_); |
| 208 #elif defined(OS_LINUX) | 212 #elif defined(OS_LINUX) |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 system_bubble_.reset(); | 731 system_bubble_.reset(); |
| 728 // When closing a system bubble with the alternate shelf layout, we need to | 732 // When closing a system bubble with the alternate shelf layout, we need to |
| 729 // turn off the active tinting of the shelf. | 733 // turn off the active tinting of the shelf. |
| 730 if (full_system_tray_menu_) { | 734 if (full_system_tray_menu_) { |
| 731 SetDrawBackgroundAsActive(false); | 735 SetDrawBackgroundAsActive(false); |
| 732 full_system_tray_menu_ = false; | 736 full_system_tray_menu_ = false; |
| 733 } | 737 } |
| 734 } | 738 } |
| 735 | 739 |
| 736 } // namespace ash | 740 } // namespace ash |
| OLD | NEW |