ash/system/tray/system_tray.cc - Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge 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/system/toast/toast_manager_unittest.cc ('K') | « ash/system/toast/toast_manager_unittest.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | ash/system/tray/tray_background_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/ash_switches.h"	7 #include "ash/ash_switches.h"

	8 #include "ash/common/material_design/material_design_controller.h"
	tdanderson 2016/06/10 22:54:43 is this #include needed? is this #include needed? yiyix 2016/06/13 18:43:55 Done. Show quoted text On 2016/06/10 22:54:43, tdanderson wrote: > is this #include needed? Done.
8 #include "ash/common/shelf/wm_shelf_util.h"	9 #include "ash/common/shelf/wm_shelf_util.h"

9 #include "ash/common/shell_window_ids.h"	10 #include "ash/common/shell_window_ids.h"

10 #include "ash/common/system/tray/system_tray_delegate.h"	11 #include "ash/common/system/tray/system_tray_delegate.h"

11 #include "ash/common/system/tray/tray_constants.h"	12 #include "ash/common/system/tray/tray_constants.h"

12 #include "ash/metrics/user_metrics_recorder.h"	13 #include "ash/metrics/user_metrics_recorder.h"

13 #include "ash/shelf/shelf_layout_manager.h"	14 #include "ash/shelf/shelf_layout_manager.h"

14 #include "ash/shelf/shelf_util.h"	15 #include "ash/shelf/shelf_util.h"

15 #include "ash/shell.h"	16 #include "ash/shell.h"

16 #include "ash/system/audio/tray_audio.h"	17 #include "ash/system/audio/tray_audio.h"

17 #include "ash/system/cast/tray_cast.h"	18 #include "ash/system/cast/tray_cast.h"

(...skipping 738 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
756 .work_area()	757 .work_area()

757 .height();	758 .height();

758 if (work_area_height > 0) {	759 if (work_area_height > 0) {

759 UMA_HISTOGRAM_CUSTOM_COUNTS(	760 UMA_HISTOGRAM_CUSTOM_COUNTS(

760 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",	761 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",

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

762 }	763 }

763 }	764 }

764	765

765 } // namespace ash	766 } // namespace ash

OLD	NEW