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

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

Issue 2390003002: [Chrome OS MD] Update spacing between material design icons in the system tray (Closed)
Patch Set: Created 4 years, 2 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 kTrayBubbleAnchorTopInsetBottomAnchor; 25 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
26 26
27 extern const int kTrayImageItemHorizontalPaddingBottomAlignment;
28 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment; 27 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
29 extern const int kTrayImageItemVerticalPaddingVerticalAlignment;
30 28
31 ASH_EXPORT extern const int kTrayItemSize; 29 ASH_EXPORT extern const int kTrayItemSize;
32 30
33 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment; 31 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
34 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment; 32 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
35 33
36 extern const int kTrayMenuBottomRowPadding; 34 extern const int kTrayMenuBottomRowPadding;
37 extern const int kTrayMenuBottomRowPaddingBetweenItems; 35 extern const int kTrayMenuBottomRowPaddingBetweenItems;
38 36
39 extern const int kTrayPopupAutoCloseDelayInSeconds; 37 extern const int kTrayPopupAutoCloseDelayInSeconds;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 TRAY_POPUP_ITEM_HEIGHT, 110 TRAY_POPUP_ITEM_HEIGHT,
113 111
114 // The width and height of the virtual keyboard button in the status tray 112 // The width and height of the virtual keyboard button in the status tray
115 // area. For non-MD, adjustments are made to the button dimensions based on 113 // area. For non-MD, adjustments are made to the button dimensions based on
116 // the shelf orientation, so this constant does not specify the true 114 // the shelf orientation, so this constant does not specify the true
117 // user-visible button bounds. 115 // user-visible button bounds.
118 VIRTUAL_KEYBOARD_BUTTON_SIZE, 116 VIRTUAL_KEYBOARD_BUTTON_SIZE,
119 117
120 // The icon size of opt-in IME menu tray. 118 // The icon size of opt-in IME menu tray.
121 TRAY_IME_MENU_ICON, 119 TRAY_IME_MENU_ICON,
120
121 // The padding needed between 2 items in the tray area in the shelf.
tdanderson 2016/10/05 21:34:29 The spec says we need a padding of 6 between two i
yiyix 2016/10/05 22:46:47 Done.
122 TRAY_IMAGE_ITEM_PADDING,
122 }; 123 };
123 124
124 int GetTrayConstant(TrayConstant constant); 125 int GetTrayConstant(TrayConstant constant);
125 126
126 namespace test { 127 namespace test {
127 const int kSettingsTrayItemViewId = 10000; 128 const int kSettingsTrayItemViewId = 10000;
128 const int kAccessibilityTrayItemViewId = 10001; 129 const int kAccessibilityTrayItemViewId = 10001;
129 } // namespace test 130 } // namespace test
130 131
131 } // namespace ash 132 } // namespace ash
132 133
133 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 134 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698