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