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/tray_constants.h" | 5 #include "ash/system/tray/tray_constants.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "third_party/skia/include/core/SkColor.h" | 8 #include "third_party/skia/include/core/SkColor.h" |
9 | 9 |
10 namespace ash { | 10 namespace ash { |
(...skipping 28 matching lines...) Expand all Loading... |
39 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; | 39 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; |
40 | 40 |
41 const int kTrayMenuBottomRowPadding = 5; | 41 const int kTrayMenuBottomRowPadding = 5; |
42 const int kTrayMenuBottomRowPaddingBetweenItems = -1; | 42 const int kTrayMenuBottomRowPaddingBetweenItems = -1; |
43 | 43 |
44 const int kTrayPopupAutoCloseDelayInSeconds = 2; | 44 const int kTrayPopupAutoCloseDelayInSeconds = 2; |
45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; | 45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; |
46 const int kTrayPopupPaddingHorizontal = 18; | 46 const int kTrayPopupPaddingHorizontal = 18; |
47 const int kTrayPopupPaddingBetweenItems = 10; | 47 const int kTrayPopupPaddingBetweenItems = 10; |
48 const int kTrayPopupTextSpacingVertical = 4; | 48 const int kTrayPopupTextSpacingVertical = 4; |
| 49 const int kTrayPopupUserCardVerticalPadding = 10; |
49 | 50 |
50 const int kTrayPopupItemHeight = 48; | 51 const int kTrayPopupItemHeight = 48; |
51 const int kTrayPopupDetailsIconWidth = 25; | 52 const int kTrayPopupDetailsIconWidth = 25; |
52 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; | 53 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; |
53 const int kTrayPopupScrollSeparatorHeight = 15; | 54 const int kTrayPopupScrollSeparatorHeight = 15; |
54 const int kTrayRoundedBorderRadius = 2; | 55 const int kTrayRoundedBorderRadius = 2; |
55 const int kTrayBarButtonWidth = 39; | 56 const int kTrayBarButtonWidth = 39; |
56 | 57 |
57 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); | 58 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); |
58 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); | 59 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); |
(...skipping 10 matching lines...) Expand all Loading... |
69 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); | 70 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); |
70 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0); | 71 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0); |
71 | 72 |
72 const int kTrayPopupMinWidth = 300; | 73 const int kTrayPopupMinWidth = 300; |
73 const int kTrayPopupMaxWidth = 500; | 74 const int kTrayPopupMaxWidth = 500; |
74 const int kNotificationIconWidth = 40; | 75 const int kNotificationIconWidth = 40; |
75 const int kNotificationButtonWidth = 32; | 76 const int kNotificationButtonWidth = 32; |
76 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth - | 77 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth - |
77 (kNotificationIconWidth + kNotificationButtonWidth + | 78 (kNotificationIconWidth + kNotificationButtonWidth + |
78 (kTrayPopupPaddingHorizontal / 2) * 3); | 79 (kTrayPopupPaddingHorizontal / 2) * 3); |
| 80 |
| 81 const int kTrayAvatarCornerRadius = 2; |
| 82 const int kTrayAvatarSize = 27; |
| 83 |
79 const int kTraySpacing = 8; | 84 const int kTraySpacing = 8; |
80 const int kAlternateTraySpacing = 4; | 85 const int kAlternateTraySpacing = 4; |
81 const int kShelfItemHeight = 31; | 86 const int kShelfItemHeight = 31; |
82 const int kAlternateShelfItemHeight = 38; | 87 const int kAlternateShelfItemHeight = 38; |
83 | 88 |
84 int GetTraySpacing() { | 89 int GetTraySpacing() { |
85 return ash::switches::UseAlternateShelfLayout() ? | 90 return ash::switches::UseAlternateShelfLayout() ? |
86 kAlternateTraySpacing : kTraySpacing; | 91 kAlternateTraySpacing : kTraySpacing; |
87 } | 92 } |
88 | 93 |
89 int GetShelfItemHeight() { | 94 int GetShelfItemHeight() { |
90 return ash::switches::UseAlternateShelfLayout() ? | 95 return ash::switches::UseAlternateShelfLayout() ? |
91 kAlternateShelfItemHeight : kShelfItemHeight; | 96 kAlternateShelfItemHeight : kShelfItemHeight; |
92 } | 97 } |
93 | 98 |
94 } // namespace ash | 99 } // namespace ash |
OLD | NEW |