Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: ash/common/system/tray/system_tray.cc

Issue 2463163002: Update chromeos system menu buttons for MD. (Closed)
Patch Set: boxlayout has some annoying dchecks Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/common/system/tray/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include "ash/common/key_event_watcher.h" 7 #include "ash/common/key_event_watcher.h"
8 #include "ash/common/login_status.h" 8 #include "ash/common/login_status.h"
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/shelf/wm_shelf.h" 11 #include "ash/common/shelf/wm_shelf.h"
12 #include "ash/common/shelf/wm_shelf_util.h" 12 #include "ash/common/shelf/wm_shelf_util.h"
13 #include "ash/common/system/cast/tray_cast.h"
14 #include "ash/common/system/date/tray_date.h" 13 #include "ash/common/system/date/tray_date.h"
15 #include "ash/common/system/date/tray_system_info.h" 14 #include "ash/common/system/date/tray_system_info.h"
16 #include "ash/common/system/tiles/tray_tiles.h" 15 #include "ash/common/system/tiles/tray_tiles.h"
17 #include "ash/common/system/tray/system_tray_controller.h" 16 #include "ash/common/system/tray/system_tray_controller.h"
18 #include "ash/common/system/tray/system_tray_delegate.h" 17 #include "ash/common/system/tray/system_tray_delegate.h"
19 #include "ash/common/system/tray/system_tray_item.h" 18 #include "ash/common/system/tray/system_tray_item.h"
20 #include "ash/common/system/tray/tray_bubble_wrapper.h" 19 #include "ash/common/system/tray/tray_bubble_wrapper.h"
21 #include "ash/common/system/tray/tray_constants.h" 20 #include "ash/common/system/tray/tray_constants.h"
22 #include "ash/common/system/tray_accessibility.h" 21 #include "ash/common/system/tray_accessibility.h"
23 #include "ash/common/system/update/tray_update.h" 22 #include "ash/common/system/update/tray_update.h"
(...skipping 22 matching lines...) Expand all
46 #include "ui/gfx/skia_util.h" 45 #include "ui/gfx/skia_util.h"
47 #include "ui/views/border.h" 46 #include "ui/views/border.h"
48 #include "ui/views/controls/label.h" 47 #include "ui/views/controls/label.h"
49 #include "ui/views/view.h" 48 #include "ui/views/view.h"
50 #include "ui/views/widget/widget.h" 49 #include "ui/views/widget/widget.h"
51 50
52 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
53 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" 52 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"
54 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h" 53 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
55 #include "ash/common/system/chromeos/brightness/tray_brightness.h" 54 #include "ash/common/system/chromeos/brightness/tray_brightness.h"
55 #include "ash/common/system/chromeos/cast/tray_cast.h"
56 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h" 56 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
57 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_ite m.h" 57 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_ite m.h"
58 #include "ash/common/system/chromeos/network/tray_network.h" 58 #include "ash/common/system/chromeos/network/tray_network.h"
59 #include "ash/common/system/chromeos/network/tray_sms.h" 59 #include "ash/common/system/chromeos/network/tray_sms.h"
60 #include "ash/common/system/chromeos/network/tray_vpn.h" 60 #include "ash/common/system/chromeos/network/tray_vpn.h"
61 #include "ash/common/system/chromeos/power/power_status.h" 61 #include "ash/common/system/chromeos/power/power_status.h"
62 #include "ash/common/system/chromeos/power/tray_power.h" 62 #include "ash/common/system/chromeos/power/tray_power.h"
63 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h" 63 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
64 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h" 64 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
65 #include "ash/common/system/chromeos/session/tray_session_length_limit.h" 65 #include "ash/common/system/chromeos/session/tray_session_length_limit.h"
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 .work_area() 952 .work_area()
953 .height(); 953 .height();
954 if (work_area_height > 0) { 954 if (work_area_height > 0) {
955 UMA_HISTOGRAM_CUSTOM_COUNTS( 955 UMA_HISTOGRAM_CUSTOM_COUNTS(
956 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 956 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
957 100 * bubble_view->height() / work_area_height, 1, 300, 100); 957 100 * bubble_view->height() / work_area_height, 1, 300, 100);
958 } 958 }
959 } 959 }
960 960
961 } // namespace ash 961 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/screen_security/screen_tray_item.cc ('k') | ash/common/system/tray/tray_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698