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

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

Issue 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review comments, fix mash_unittests Created 4 years, 5 months 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/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 29 matching lines...) Expand all
40 #include "ui/gfx/skia_util.h" 40 #include "ui/gfx/skia_util.h"
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/session/tray_session_length_limit.h"
50 #include "ash/common/system/chromeos/settings/tray_settings.h" 51 #include "ash/common/system/chromeos/settings/tray_settings.h"
51 #include "ash/common/system/chromeos/tray_tracing.h" 52 #include "ash/common/system/chromeos/tray_tracing.h"
52 #include "ash/common/system/ime/tray_ime_chromeos.h" 53 #include "ash/common/system/ime/tray_ime_chromeos.h"
53 #include "ash/system/chromeos/audio/tray_audio_chromeos.h" 54 #include "ash/system/chromeos/audio/tray_audio_chromeos.h"
54 #include "ash/system/chromeos/bluetooth/tray_bluetooth.h" 55 #include "ash/system/chromeos/bluetooth/tray_bluetooth.h"
55 #include "ash/system/chromeos/brightness/tray_brightness.h" 56 #include "ash/system/chromeos/brightness/tray_brightness.h"
56 #include "ash/system/chromeos/enterprise/tray_enterprise.h" 57 #include "ash/system/chromeos/enterprise/tray_enterprise.h"
57 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h" 58 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
58 #include "ash/system/chromeos/network/tray_network.h" 59 #include "ash/system/chromeos/network/tray_network.h"
59 #include "ash/system/chromeos/network/tray_sms.h" 60 #include "ash/system/chromeos/network/tray_sms.h"
60 #include "ash/system/chromeos/network/tray_vpn.h" 61 #include "ash/system/chromeos/network/tray_vpn.h"
61 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" 62 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
62 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" 63 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
63 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" 64 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
64 #include "ash/system/chromeos/session/tray_session_length_limit.h"
65 #include "ash/system/chromeos/supervised/tray_supervised_user.h" 65 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
66 #include "ash/system/chromeos/tray_caps_lock.h" 66 #include "ash/system/chromeos/tray_caps_lock.h"
67 #include "ash/system/chromeos/tray_display.h" 67 #include "ash/system/chromeos/tray_display.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
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 .work_area() 769 .work_area()
770 .height(); 770 .height();
771 if (work_area_height > 0) { 771 if (work_area_height > 0) {
772 UMA_HISTOGRAM_CUSTOM_COUNTS( 772 UMA_HISTOGRAM_CUSTOM_COUNTS(
773 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 773 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
774 100 * bubble_view->height() / work_area_height, 1, 300, 100); 774 100 * bubble_view->height() / work_area_height, 1, 300, 100);
775 } 775 }
776 } 776 }
777 777
778 } // namespace ash 778 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698