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/audio/tray_audio.h" |
14 #include "ash/system/bluetooth/tray_bluetooth.h" | 14 #include "ash/system/bluetooth/tray_bluetooth.h" |
15 #include "ash/system/date/tray_date.h" | 15 #include "ash/system/date/tray_date.h" |
16 #include "ash/system/drive/tray_drive.h" | 16 #include "ash/system/drive/tray_drive.h" |
17 #include "ash/system/ime/tray_ime.h" | 17 #include "ash/system/ime/tray_ime.h" |
18 #include "ash/system/session_length_limit/tray_session_length_limit.h" | 18 #include "ash/system/session/tray_session_length_limit.h" |
19 #include "ash/system/status_area_widget.h" | 19 #include "ash/system/status_area_widget.h" |
20 #include "ash/system/tray/system_tray_delegate.h" | 20 #include "ash/system/tray/system_tray_delegate.h" |
21 #include "ash/system/tray/system_tray_item.h" | 21 #include "ash/system/tray/system_tray_item.h" |
22 #include "ash/system/tray/tray_bubble_wrapper.h" | 22 #include "ash/system/tray/tray_bubble_wrapper.h" |
23 #include "ash/system/tray/tray_constants.h" | 23 #include "ash/system/tray/tray_constants.h" |
24 #include "ash/system/tray_accessibility.h" | 24 #include "ash/system/tray_accessibility.h" |
25 #include "ash/system/tray_caps_lock.h" | 25 #include "ash/system/tray_caps_lock.h" |
26 #include "ash/system/tray_update.h" | 26 #include "ash/system/tray_update.h" |
27 #include "ash/system/user/login_status.h" | 27 #include "ash/system/user/login_status.h" |
28 #include "ash/system/user/tray_user.h" | 28 #include "ash/system/user/tray_user.h" |
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 system_bubble_.reset(); | 710 system_bubble_.reset(); |
711 // 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 |
712 // turn off the active tinting of the shelf. | 712 // turn off the active tinting of the shelf. |
713 if (full_system_tray_menu_) { | 713 if (full_system_tray_menu_) { |
714 SetDrawBackgroundAsActive(false); | 714 SetDrawBackgroundAsActive(false); |
715 full_system_tray_menu_ = false; | 715 full_system_tray_menu_ = false; |
716 } | 716 } |
717 } | 717 } |
718 | 718 |
719 } // namespace ash | 719 } // namespace ash |
OLD | NEW |