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

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

Issue 2675983003: views::Separator cleanup. (Closed)
Patch Set: Created 3 years, 10 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;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 extern const int kTrayPopupMinWidth; 84 extern const int kTrayPopupMinWidth;
85 extern const int kTrayPopupMaxWidth; 85 extern const int kTrayPopupMaxWidth;
86 extern const int kNotificationIconWidth; 86 extern const int kNotificationIconWidth;
87 extern const int kNotificationButtonWidth; 87 extern const int kNotificationButtonWidth;
88 extern const int kTrayNotificationContentsWidth; 88 extern const int kTrayNotificationContentsWidth;
89 89
90 // Extra padding used to adjust hitting region around tray items. 90 // Extra padding used to adjust hitting region around tray items.
91 extern const int kHitRegionPadding; 91 extern const int kHitRegionPadding;
92 92
93 // Color and width of a line used to separate tray items in the shelf and 93 // Color and width of a line used to separate tray items in the shelf.
94 // system menu. 94 extern const SkColor kTraySeparatorColor;
95 extern const SkColor kSeparatorColor;
96 ASH_EXPORT extern const int kSeparatorWidth; 95 ASH_EXPORT extern const int kSeparatorWidth;
97 96
98 // The color and height of the horizontal separator used in the material design 97 // The color and height of the vertical separator used in the material design
99 // system menu (i.e., the vertical line used to separate elements horizontally). 98 // system menu (i.e., the vertical line used to separate elements horizontally).
100 extern const SkColor kHorizontalSeparatorColor; 99 extern const SkColor kMenuSeparatorColor;
101 extern const int kHorizontalSeparatorHeight;
102 100
103 // The size and foreground color of the icons appearing in the material design 101 // The size and foreground color of the icons appearing in the material design
104 // system tray. 102 // system tray.
105 extern const int kTrayIconSize; 103 extern const int kTrayIconSize;
106 extern const SkColor kTrayIconColor; 104 extern const SkColor kTrayIconColor;
107 105
108 // The total visual padding at the start and end of the icon/label section 106 // The total visual padding at the start and end of the icon/label section
109 // of the tray. 107 // of the tray.
110 extern const int kTrayEdgePadding; 108 extern const int kTrayEdgePadding;
111 109
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 ASH_EXPORT int GetTrayConstant(TrayConstant constant); 202 ASH_EXPORT int GetTrayConstant(TrayConstant constant);
205 203
206 namespace test { 204 namespace test {
207 const int kSettingsTrayItemViewId = 10000; 205 const int kSettingsTrayItemViewId = 10000;
208 const int kAccessibilityTrayItemViewId = 10001; 206 const int kAccessibilityTrayItemViewId = 10001;
209 } // namespace test 207 } // namespace test
210 208
211 } // namespace ash 209 } // namespace ash
212 210
213 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 211 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698