| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 AddTrayItem(new TrayDisplay(this)); | 185 AddTrayItem(new TrayDisplay(this)); |
| 186 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this); | 186 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this); |
| 187 AddTrayItem(screen_capture_tray_item_); | 187 AddTrayItem(screen_capture_tray_item_); |
| 188 screen_share_tray_item_ = new ScreenShareTrayItem(this); | 188 screen_share_tray_item_ = new ScreenShareTrayItem(this); |
| 189 AddTrayItem(screen_share_tray_item_); | 189 AddTrayItem(screen_share_tray_item_); |
| 190 AddTrayItem(new TrayKeyboardLock(this)); | 190 AddTrayItem(new TrayKeyboardLock(this)); |
| 191 AddTrayItem(new MultiProfileMediaTrayItem(this)); | 191 AddTrayItem(new MultiProfileMediaTrayItem(this)); |
| 192 AddTrayItem(new TrayAudioChromeOs(this)); | 192 AddTrayItem(new TrayAudioChromeOs(this)); |
| 193 AddTrayItem(new TrayBrightness(this)); | 193 AddTrayItem(new TrayBrightness(this)); |
| 194 AddTrayItem(new TrayCapsLock(this)); | 194 AddTrayItem(new TrayCapsLock(this)); |
| 195 AddTrayItem(new TrayRotationLock(this)); |
| 195 AddTrayItem(new TraySettings(this)); | 196 AddTrayItem(new TraySettings(this)); |
| 196 AddTrayItem(new TrayUpdate(this)); | 197 AddTrayItem(new TrayUpdate(this)); |
| 197 AddTrayItem(new TrayRotationLock(this)); | |
| 198 AddTrayItem(tray_date_); | 198 AddTrayItem(tray_date_); |
| 199 #elif defined(OS_WIN) | 199 #elif defined(OS_WIN) |
| 200 AddTrayItem(tray_accessibility_); | 200 AddTrayItem(tray_accessibility_); |
| 201 if (media::CoreAudioUtil::IsSupported()) | 201 if (media::CoreAudioUtil::IsSupported()) |
| 202 AddTrayItem(new TrayAudioWin(this)); | 202 AddTrayItem(new TrayAudioWin(this)); |
| 203 AddTrayItem(new TrayUpdate(this)); | 203 AddTrayItem(new TrayUpdate(this)); |
| 204 AddTrayItem(tray_date_); | 204 AddTrayItem(tray_date_); |
| 205 #elif defined(OS_LINUX) | 205 #elif defined(OS_LINUX) |
| 206 AddTrayItem(new TrayIME(this)); | 206 AddTrayItem(new TrayIME(this)); |
| 207 AddTrayItem(tray_accessibility_); | 207 AddTrayItem(tray_accessibility_); |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 system_bubble_.reset(); | 722 system_bubble_.reset(); |
| 723 // When closing a system bubble with the alternate shelf layout, we need to | 723 // When closing a system bubble with the alternate shelf layout, we need to |
| 724 // turn off the active tinting of the shelf. | 724 // turn off the active tinting of the shelf. |
| 725 if (full_system_tray_menu_) { | 725 if (full_system_tray_menu_) { |
| 726 SetDrawBackgroundAsActive(false); | 726 SetDrawBackgroundAsActive(false); |
| 727 full_system_tray_menu_ = false; | 727 full_system_tray_menu_ = false; |
| 728 } | 728 } |
| 729 } | 729 } |
| 730 | 730 |
| 731 } // namespace ash | 731 } // namespace ash |
| OLD | NEW |