ash/system/tray/system_tray.cc - Issue 2099793002: mash: Migrate some system user files to common.

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

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup Created 4 years, 6 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

« ash/root_window_controller.h ('K') | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »

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/session/session_state_delegate.h"	9 #include "ash/common/session/session_state_delegate.h"

9 #include "ash/common/shelf/wm_shelf.h"	10 #include "ash/common/shelf/wm_shelf.h"

10 #include "ash/common/shelf/wm_shelf_util.h"	11 #include "ash/common/shelf/wm_shelf_util.h"

11 #include "ash/common/shell_window_ids.h"	12 #include "ash/common/shell_window_ids.h"

12 #include "ash/common/system/date/tray_date.h"	13 #include "ash/common/system/date/tray_date.h"

13 #include "ash/common/system/tray/system_tray_delegate.h"	14 #include "ash/common/system/tray/system_tray_delegate.h"

14 #include "ash/common/system/tray/system_tray_item.h"	15 #include "ash/common/system/tray/system_tray_item.h"

15 #include "ash/common/system/tray/tray_bubble_wrapper.h"	16 #include "ash/common/system/tray/tray_bubble_wrapper.h"

16 #include "ash/common/system/tray/tray_constants.h"	17 #include "ash/common/system/tray/tray_constants.h"

17 #include "ash/common/system/tray_accessibility.h"	18 #include "ash/common/system/tray_accessibility.h"

18 #include "ash/common/system/update/tray_update.h"	19 #include "ash/common/system/update/tray_update.h"

	20 #include "ash/common/system/user/tray_user_separator.h"

19 #include "ash/common/wm_lookup.h"	21 #include "ash/common/wm_lookup.h"

20 #include "ash/common/wm_root_window_controller.h"	22 #include "ash/common/wm_root_window_controller.h"

21 #include "ash/common/wm_shell.h"	23 #include "ash/common/wm_shell.h"

22 #include "ash/common/wm_window.h"	24 #include "ash/common/wm_window.h"

23 #include "ash/shell.h"	25 #include "ash/shell.h"

24 #include "ash/system/cast/tray_cast.h"	26 #include "ash/system/cast/tray_cast.h"

25 #include "ash/system/status_area_widget.h"	27 #include "ash/system/status_area_widget.h"

26 #include "ash/system/user/login_status.h"

27 #include "ash/system/user/tray_user.h"	28 #include "ash/system/user/tray_user.h"

28 #include "ash/system/user/tray_user_separator.h"

29 #include "ash/system/web_notification/web_notification_tray.h"	29 #include "ash/system/web_notification/web_notification_tray.h"

30 #include "base/logging.h"	30 #include "base/logging.h"

31 #include "base/metrics/histogram.h"	31 #include "base/metrics/histogram.h"

32 #include "base/strings/utf_string_conversions.h"	32 #include "base/strings/utf_string_conversions.h"

33 #include "base/timer/timer.h"	33 #include "base/timer/timer.h"

34 #include "grit/ash_strings.h"	34 #include "grit/ash_strings.h"

35 #include "ui/base/l10n/l10n_util.h"	35 #include "ui/base/l10n/l10n_util.h"

36 #include "ui/compositor/layer.h"	36 #include "ui/compositor/layer.h"

37 #include "ui/display/display.h"	37 #include "ui/display/display.h"

38 #include "ui/display/screen.h"	38 #include "ui/display/screen.h"

(...skipping 731 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
770 .work_area()	770 .work_area()

771 .height();	771 .height();

772 if (work_area_height > 0) {	772 if (work_area_height > 0) {

773 UMA_HISTOGRAM_CUSTOM_COUNTS(	773 UMA_HISTOGRAM_CUSTOM_COUNTS(

774 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",	774 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",

775 100 * bubble_view->height() / work_area_height, 1, 300, 100);	775 100 * bubble_view->height() / work_area_height, 1, 300, 100);

776 }	776 }

777 }	777 }

778	778

779 } // namespace ash	779 } // namespace ash

OLD	NEW