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

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

Issue 2698213004: Start removing some pre-md constants and related code. (Closed)
Patch Set: actually use the constant 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
« no previous file with comments | « ash/common/system/tray/system_tray_item.cc ('k') | ash/common/system/tray/tray_constants.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 30 matching lines...) Expand all
41 extern const int kTrayPopupAutoCloseDelayInSeconds; 41 extern const int kTrayPopupAutoCloseDelayInSeconds;
42 extern const int kTrayPopupAutoCloseDelayForTextInSeconds; 42 extern const int kTrayPopupAutoCloseDelayForTextInSeconds;
43 extern const int kTrayPopupPaddingHorizontal; 43 extern const int kTrayPopupPaddingHorizontal;
44 extern const int kTrayPopupPaddingBetweenItems; 44 extern const int kTrayPopupPaddingBetweenItems;
45 // Used for buttons that have borders. 45 // Used for buttons that have borders.
46 extern const int kTrayPopupButtonEndMargin; 46 extern const int kTrayPopupButtonEndMargin;
47 // The padding used on the left and right of labels. This applies to all labels 47 // The padding used on the left and right of labels. This applies to all labels
48 // in the system menu. 48 // in the system menu.
49 extern const int kTrayPopupLabelHorizontalPadding; 49 extern const int kTrayPopupLabelHorizontalPadding;
50 50
51 // When transitioning between a detailed and a default view, this delay is used
52 // before the transition starts.
53 ASH_EXPORT extern const int kTrayDetailedViewTransitionDelayMs;
54
51 // Padding used to adjust the slider position in volume row and brightness 55 // Padding used to adjust the slider position in volume row and brightness
52 // row horizontally. 56 // row horizontally.
53 extern const int kTrayPopupSliderPaddingMD; 57 extern const int kTrayPopupSliderPaddingMD;
54 58
55 // Padding used on right side of labels to keep minimum distance to the next 59 // Padding used on right side of labels to keep minimum distance to the next
56 // item. This applies to all labels in the system menu. 60 // item. This applies to all labels in the system menu.
57 extern const int kTrayPopupLabelRightPadding; 61 extern const int kTrayPopupLabelRightPadding;
58 62
59 extern const int kTrayPopupDetailsIconWidth; 63 extern const int kTrayPopupDetailsIconWidth;
60 extern const int kTrayPopupDetailsLabelExtraLeftMargin; 64 extern const int kTrayPopupDetailsLabelExtraLeftMargin;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 extern const int kTrayPopupInkDropCornerRadius; 140 extern const int kTrayPopupInkDropCornerRadius;
137 141
138 // The height of the system info row. 142 // The height of the system info row.
139 extern const int kTrayPopupSystemInfoRowHeight; 143 extern const int kTrayPopupSystemInfoRowHeight;
140 144
141 enum TrayConstant { 145 enum TrayConstant {
142 // A legacy height value used in non-MD calculations for applying additional 146 // A legacy height value used in non-MD calculations for applying additional
143 // borders on tray items. 147 // borders on tray items.
144 TRAY_ITEM_HEIGHT_LEGACY, 148 TRAY_ITEM_HEIGHT_LEGACY,
145 149
146 // Padding between items in the status tray area.
147 TRAY_SPACING,
148
149 // Padding between the edge of shelf and the item in status tray area. 150 // Padding between the edge of shelf and the item in status tray area.
150 TRAY_PADDING_FROM_EDGE_OF_SHELF, 151 TRAY_PADDING_FROM_EDGE_OF_SHELF,
151 152
152 // The minimum height of the rows in the system tray menu. 153 // The minimum height of the rows in the system tray menu.
153 TRAY_POPUP_ITEM_MIN_HEIGHT, 154 TRAY_POPUP_ITEM_MIN_HEIGHT,
154 155
155 // The maximum height of the rows in the system tray menu. 156 // The maximum height of the rows in the system tray menu.
156 TRAY_POPUP_ITEM_MAX_HEIGHT, 157 TRAY_POPUP_ITEM_MAX_HEIGHT,
157 158
158 // The width used for the main image of the row. This applies to all rows 159 // The width used for the main image of the row. This applies to all rows
159 // in the system menu that have a main image (e.g. default and detailed). 160 // in the system menu that have a main image (e.g. default and detailed).
160 TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH, 161 TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH,
161 162
162 // The width used for the images used in the 'more' region of default rows. 163 // The width used for the images used in the 'more' region of default rows.
163 TRAY_POPUP_ITEM_MORE_IMAGE_SIZE, 164 TRAY_POPUP_ITEM_MORE_IMAGE_SIZE,
164 165
165 // The horizontal inset in the 'more' region of default rows. 166 // The horizontal inset in the 'more' region of default rows.
166 TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET, 167 TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET,
167 168
168 // The left inset for all tray system menu rows. 169 // The left inset for all tray system menu rows.
169 TRAY_POPUP_ITEM_LEFT_INSET, 170 TRAY_POPUP_ITEM_LEFT_INSET,
170 171
171 // The right inset for all tray system menu rows.
172 TRAY_POPUP_ITEM_RIGHT_INSET,
173
174 // The minimum default width for the left container of the system menu rows. 172 // The minimum default width for the left container of the system menu rows.
175 TRAY_POPUP_ITEM_MIN_START_WIDTH, 173 TRAY_POPUP_ITEM_MIN_START_WIDTH,
176 174
177 // The minimum default width for the right container of the system menu rows. 175 // The minimum default width for the right container of the system menu rows.
178 TRAY_POPUP_ITEM_MIN_END_WIDTH, 176 TRAY_POPUP_ITEM_MIN_END_WIDTH,
179 177
180 // Duration to delay transitions to the default view.
181 TRAY_POPUP_TRANSITION_TO_DEFAULT_DELAY,
182
183 // Duration to delay transitions to the detailed view.
184 TRAY_POPUP_TRANSITION_TO_DETAILED_DELAY,
185
186 // The width and height of the virtual keyboard button in the status tray 178 // The width and height of the virtual keyboard button in the status tray
187 // area. For non-MD, adjustments are made to the button dimensions based on 179 // area. For non-MD, adjustments are made to the button dimensions based on
188 // the shelf orientation, so this constant does not specify the true 180 // the shelf orientation, so this constant does not specify the true
189 // user-visible button bounds. 181 // user-visible button bounds.
190 VIRTUAL_KEYBOARD_BUTTON_SIZE, 182 VIRTUAL_KEYBOARD_BUTTON_SIZE,
191 183
192 // The icon size of opt-in IME menu tray. 184 // The icon size of opt-in IME menu tray.
193 TRAY_IME_MENU_ICON, 185 TRAY_IME_MENU_ICON,
194 186
195 // Extra padding used beside a single icon in the tray area of the shelf. 187 // Extra padding used beside a single icon in the tray area of the shelf.
196 TRAY_IMAGE_ITEM_PADDING, 188 TRAY_IMAGE_ITEM_PADDING,
197 }; 189 };
198 190
199 ASH_EXPORT int GetTrayConstant(TrayConstant constant); 191 ASH_EXPORT int GetTrayConstant(TrayConstant constant);
200 192
201 namespace test { 193 namespace test {
202 const int kSettingsTrayItemViewId = 10000; 194 const int kSettingsTrayItemViewId = 10000;
203 const int kAccessibilityTrayItemViewId = 10001; 195 const int kAccessibilityTrayItemViewId = 10001;
204 } // namespace test 196 } // namespace test
205 197
206 } // namespace ash 198 } // namespace ash
207 199
208 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 200 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_item.cc ('k') | ash/common/system/tray/tray_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698