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/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
8 #include "ash/common/login_status.h" | 8 #include "ash/common/login_status.h" |
9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
39 #include "ui/gfx/skia_util.h" | 39 #include "ui/gfx/skia_util.h" |
40 #include "ui/views/border.h" | 40 #include "ui/views/border.h" |
41 #include "ui/views/controls/label.h" | 41 #include "ui/views/controls/label.h" |
42 #include "ui/views/layout/box_layout.h" | 42 #include "ui/views/layout/box_layout.h" |
43 #include "ui/views/layout/fill_layout.h" | 43 #include "ui/views/layout/fill_layout.h" |
44 #include "ui/views/view.h" | 44 #include "ui/views/view.h" |
45 | 45 |
46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
47 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" | 47 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" |
| 48 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" |
| 49 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h" |
48 #include "ash/common/system/chromeos/network/tray_network.h" | 50 #include "ash/common/system/chromeos/network/tray_network.h" |
49 #include "ash/common/system/chromeos/network/tray_sms.h" | 51 #include "ash/common/system/chromeos/network/tray_sms.h" |
50 #include "ash/common/system/chromeos/network/tray_vpn.h" | 52 #include "ash/common/system/chromeos/network/tray_vpn.h" |
51 #include "ash/common/system/chromeos/power/power_status.h" | 53 #include "ash/common/system/chromeos/power/power_status.h" |
52 #include "ash/common/system/chromeos/power/tray_power.h" | 54 #include "ash/common/system/chromeos/power/tray_power.h" |
53 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h" | 55 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h" |
54 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h" | 56 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h" |
55 #include "ash/common/system/chromeos/session/tray_session_length_limit.h" | 57 #include "ash/common/system/chromeos/session/tray_session_length_limit.h" |
56 #include "ash/common/system/chromeos/settings/tray_settings.h" | 58 #include "ash/common/system/chromeos/settings/tray_settings.h" |
| 59 #include "ash/common/system/chromeos/supervised/tray_supervised_user.h" |
| 60 #include "ash/common/system/chromeos/tray_caps_lock.h" |
57 #include "ash/common/system/chromeos/tray_tracing.h" | 61 #include "ash/common/system/chromeos/tray_tracing.h" |
58 #include "ash/common/system/ime/tray_ime_chromeos.h" | 62 #include "ash/common/system/ime/tray_ime_chromeos.h" |
59 #include "ash/system/chromeos/bluetooth/tray_bluetooth.h" | |
60 #include "ash/system/chromeos/brightness/tray_brightness.h" | 63 #include "ash/system/chromeos/brightness/tray_brightness.h" |
61 #include "ash/system/chromeos/enterprise/tray_enterprise.h" | |
62 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h" | 64 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h" |
63 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" | 65 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" |
64 #include "ash/system/chromeos/supervised/tray_supervised_user.h" | |
65 #include "ash/system/chromeos/tray_caps_lock.h" | |
66 #include "ash/system/chromeos/tray_display.h" | 66 #include "ash/system/chromeos/tray_display.h" |
67 #include "ui/message_center/message_center.h" | 67 #include "ui/message_center/message_center.h" |
68 #endif | 68 #endif |
69 | 69 |
70 using views::TrayBubbleView; | 70 using views::TrayBubbleView; |
71 | 71 |
72 namespace ash { | 72 namespace ash { |
73 | 73 |
74 // The minimum width of the system tray menu width. | 74 // The minimum width of the system tray menu width. |
75 const int kMinimumSystemTrayMenuWidth = 300; | 75 const int kMinimumSystemTrayMenuWidth = 300; |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 .work_area() | 763 .work_area() |
764 .height(); | 764 .height(); |
765 if (work_area_height > 0) { | 765 if (work_area_height > 0) { |
766 UMA_HISTOGRAM_CUSTOM_COUNTS( | 766 UMA_HISTOGRAM_CUSTOM_COUNTS( |
767 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", | 767 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", |
768 100 * bubble_view->height() / work_area_height, 1, 300, 100); | 768 100 * bubble_view->height() / work_area_height, 1, 300, 100); |
769 } | 769 } |
770 } | 770 } |
771 | 771 |
772 } // namespace ash | 772 } // namespace ash |
OLD | NEW |