Chromium Code Reviews| 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 #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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 // The size and foreground color of the icons appearing in the material design | 90 // The size and foreground color of the icons appearing in the material design |
| 91 // system tray. | 91 // system tray. |
| 92 extern const int kTrayIconSize; | 92 extern const int kTrayIconSize; |
| 93 extern const SkColor kTrayIconColor; | 93 extern const SkColor kTrayIconColor; |
| 94 | 94 |
| 95 // The size and foreground color of the icons appearing in the material design | 95 // The size and foreground color of the icons appearing in the material design |
| 96 // system menu. | 96 // system menu. |
| 97 extern const int kMenuIconSize; | 97 extern const int kMenuIconSize; |
| 98 extern const SkColor kMenuIconColor; | 98 extern const SkColor kMenuIconColor; |
| 99 | 99 |
| 100 // The margin between the edge of the menu and the edge of the button. | |
| 101 extern const int kMenuIconMargin; | |
| 102 | |
| 103 // The size of buttons in the system menu. | |
| 104 extern const int kMenuButtonSize; | |
|
tdanderson
2016/09/21 17:59:32
kMenuButtonSize was added by another CL, make sure
yiyix
2016/09/21 19:02:26
Sure, i will rebase the code before send to other
| |
| 105 | |
| 100 enum TrayConstant { | 106 enum TrayConstant { |
| 101 // A legacy height value used in non-MD calculations for applying additional | 107 // A legacy height value used in non-MD calculations for applying additional |
| 102 // borders on tray items. | 108 // borders on tray items. |
| 103 TRAY_ITEM_HEIGHT_LEGACY, | 109 TRAY_ITEM_HEIGHT_LEGACY, |
| 104 | 110 |
| 105 // Padding between items in the status tray area. | 111 // Padding between items in the status tray area. |
| 106 TRAY_SPACING, | 112 TRAY_SPACING, |
| 107 | 113 |
| 108 // Padding between the edge of shelf and the item in status tray area. | 114 // Padding between the edge of shelf and the item in status tray area. |
| 109 TRAY_PADDING_FROM_EDGE_OF_SHELF, | 115 TRAY_PADDING_FROM_EDGE_OF_SHELF, |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 121 int GetTrayConstant(TrayConstant constant); | 127 int GetTrayConstant(TrayConstant constant); |
| 122 | 128 |
| 123 namespace test { | 129 namespace test { |
| 124 const int kSettingsTrayItemViewId = 10000; | 130 const int kSettingsTrayItemViewId = 10000; |
| 125 const int kAccessibilityTrayItemViewId = 10001; | 131 const int kAccessibilityTrayItemViewId = 10001; |
| 126 } // namespace test | 132 } // namespace test |
| 127 | 133 |
| 128 } // namespace ash | 134 } // namespace ash |
| 129 | 135 |
| 130 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ | 136 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ |
| OLD | NEW |