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

Side by Side Diff: ash/common/system/tray/tray_constants.h

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: Address comments from @tdanderson 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
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 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 typedef unsigned int SkColor; 10 typedef unsigned int SkColor;
11 11
12 namespace ash { 12 namespace ash {
13 13
14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment; 14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment;
15 extern const int kPaddingFromBottomOfScreenBottomAlignment; 15 extern const int kPaddingFromBottomOfScreenBottomAlignment;
16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment; 16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
17 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment; 17 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
18 extern const int kPaddingFromBottomOfScreenVerticalAlignment; 18 extern const int kPaddingFromBottomOfScreenVerticalAlignment;
19 19
20 extern const int kBubblePaddingHorizontalBottom; 20 extern const int kBubblePaddingHorizontalBottom;
21 extern const int kBubblePaddingHorizontalSide; 21 extern const int kBubblePaddingHorizontalSide;
22 extern const int kBubblePaddingVerticalBottom; 22 extern const int kBubblePaddingVerticalBottom;
23 extern const int kBubblePaddingVerticalSide; 23 extern const int kBubblePaddingVerticalSide;
24 24
25 extern const int kPaddingFromEdgeOfShelf; 25 extern const int kAdjustBackgroundPadding;
26 enum ShelfStatusAreaInset {
tdanderson 2016/06/13 19:02:51 I would just call this TrayConstant (to be consist
yiyix 2016/06/13 19:14:00 Done.
27 // Padding between items in the status tray area.
28 TRAY_SPACING,
29
30 // Padding between the edge of shelf and the item in status tray area.
31 PADDING_FROM_EDGE_OF_SHELF,
32 };
33
26 extern const int kTrayBubbleAnchorTopInsetBottomAnchor; 34 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
27 35
28 extern const int kTrayImageItemHorizontalPaddingBottomAlignment; 36 extern const int kTrayImageItemHorizontalPaddingBottomAlignment;
29 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment; 37 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
30 extern const int kTrayImageItemVerticalPaddingVerticalAlignment; 38 extern const int kTrayImageItemVerticalPaddingVerticalAlignment;
31 39
32 ASH_EXPORT extern const int kTrayItemSize; 40 ASH_EXPORT extern const int kTrayItemSize;
33 41
34 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment; 42 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
35 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment; 43 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 77
70 extern const int kTrayPopupMinWidth; 78 extern const int kTrayPopupMinWidth;
71 extern const int kTrayPopupMaxWidth; 79 extern const int kTrayPopupMaxWidth;
72 extern const int kNotificationIconWidth; 80 extern const int kNotificationIconWidth;
73 extern const int kNotificationButtonWidth; 81 extern const int kNotificationButtonWidth;
74 extern const int kTrayNotificationContentsWidth; 82 extern const int kTrayNotificationContentsWidth;
75 83
76 extern const int kTrayAvatarCornerRadius; 84 extern const int kTrayAvatarCornerRadius;
77 extern const int kTrayAvatarSize; 85 extern const int kTrayAvatarSize;
78 86
79 extern const int kTraySpacing; 87 extern const int kMessageCenterBubblePadding;
80 extern const int kShelfItemHeight; 88 extern const int kShelfItemHeight;
89 extern const int kShelfItemSizeMD;
90
91 int GetTrayConstant(ShelfStatusAreaInset constant);
81 92
82 namespace test { 93 namespace test {
83 const int kSettingsTrayItemViewId = 10000; 94 const int kSettingsTrayItemViewId = 10000;
84 const int kAccessibilityTrayItemViewId = 10001; 95 const int kAccessibilityTrayItemViewId = 10001;
85 } // namespace test 96 } // namespace test
86 97
87 } // namespace ash 98 } // namespace ash
88 99
89 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 100 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698