| 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" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "ash/system/chromeos/network/tray_vpn.h" | 54 #include "ash/system/chromeos/network/tray_vpn.h" |
| 55 #include "ash/system/chromeos/power/tray_power.h" | 55 #include "ash/system/chromeos/power/tray_power.h" |
| 56 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" | 56 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" |
| 57 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" | 57 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" |
| 58 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" | 58 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" |
| 59 #include "ash/system/chromeos/session/tray_session_length_limit.h" | 59 #include "ash/system/chromeos/session/tray_session_length_limit.h" |
| 60 #include "ash/system/chromeos/settings/tray_settings.h" | 60 #include "ash/system/chromeos/settings/tray_settings.h" |
| 61 #include "ash/system/chromeos/tray_caps_lock.h" | 61 #include "ash/system/chromeos/tray_caps_lock.h" |
| 62 #include "ash/system/chromeos/tray_display.h" | 62 #include "ash/system/chromeos/tray_display.h" |
| 63 #include "ash/system/chromeos/tray_tracing.h" | 63 #include "ash/system/chromeos/tray_tracing.h" |
| 64 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h" |
| 64 #include "ui/message_center/message_center.h" | 65 #include "ui/message_center/message_center.h" |
| 65 #elif defined(OS_WIN) | 66 #elif defined(OS_WIN) |
| 66 #include "ash/system/win/audio/tray_audio_win.h" | 67 #include "ash/system/win/audio/tray_audio_win.h" |
| 67 #include "media/audio/win/core_audio_util_win.h" | 68 #include "media/audio/win/core_audio_util_win.h" |
| 68 #endif | 69 #endif |
| 69 | 70 |
| 70 using views::TrayBubbleView; | 71 using views::TrayBubbleView; |
| 71 | 72 |
| 72 namespace ash { | 73 namespace ash { |
| 73 | 74 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 AddTrayItem(new TrayTracing(this)); | 182 AddTrayItem(new TrayTracing(this)); |
| 182 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); | 183 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); |
| 183 AddTrayItem(new TrayNetwork(this)); | 184 AddTrayItem(new TrayNetwork(this)); |
| 184 AddTrayItem(new TrayVPN(this)); | 185 AddTrayItem(new TrayVPN(this)); |
| 185 AddTrayItem(new TraySms(this)); | 186 AddTrayItem(new TraySms(this)); |
| 186 AddTrayItem(new TrayBluetooth(this)); | 187 AddTrayItem(new TrayBluetooth(this)); |
| 187 AddTrayItem(new TrayDrive(this)); | 188 AddTrayItem(new TrayDrive(this)); |
| 188 AddTrayItem(new TrayDisplay(this)); | 189 AddTrayItem(new TrayDisplay(this)); |
| 189 AddTrayItem(new ScreenCaptureTrayItem(this)); | 190 AddTrayItem(new ScreenCaptureTrayItem(this)); |
| 190 AddTrayItem(new ScreenShareTrayItem(this)); | 191 AddTrayItem(new ScreenShareTrayItem(this)); |
| 192 AddTrayItem(new MultiProfileMediaTrayItem(this)); |
| 191 AddTrayItem(new TrayAudioChromeOs(this)); | 193 AddTrayItem(new TrayAudioChromeOs(this)); |
| 192 AddTrayItem(new TrayBrightness(this)); | 194 AddTrayItem(new TrayBrightness(this)); |
| 193 AddTrayItem(new TrayCapsLock(this)); | 195 AddTrayItem(new TrayCapsLock(this)); |
| 194 AddTrayItem(new TraySettings(this)); | 196 AddTrayItem(new TraySettings(this)); |
| 195 AddTrayItem(new TrayUpdate(this)); | 197 AddTrayItem(new TrayUpdate(this)); |
| 196 AddTrayItem(new TrayRotationLock(this)); | 198 AddTrayItem(new TrayRotationLock(this)); |
| 197 AddTrayItem(tray_date_); | 199 AddTrayItem(tray_date_); |
| 198 #elif defined(OS_WIN) | 200 #elif defined(OS_WIN) |
| 199 AddTrayItem(tray_accessibility_); | 201 AddTrayItem(tray_accessibility_); |
| 200 if (media::CoreAudioUtil::IsSupported()) | 202 if (media::CoreAudioUtil::IsSupported()) |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 system_bubble_.reset(); | 710 system_bubble_.reset(); |
| 709 // When closing a system bubble with the alternate shelf layout, we need to | 711 // When closing a system bubble with the alternate shelf layout, we need to |
| 710 // turn off the active tinting of the shelf. | 712 // turn off the active tinting of the shelf. |
| 711 if (full_system_tray_menu_) { | 713 if (full_system_tray_menu_) { |
| 712 SetDrawBackgroundAsActive(false); | 714 SetDrawBackgroundAsActive(false); |
| 713 full_system_tray_menu_ = false; | 715 full_system_tray_menu_ = false; |
| 714 } | 716 } |
| 715 } | 717 } |
| 716 | 718 |
| 717 } // namespace ash | 719 } // namespace ash |
| OLD | NEW |