| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 | 86 |
| 87 // The size and foreground color of the icons appearing in the material design | 87 // The size and foreground color of the icons appearing in the material design |
| 88 // system tray. | 88 // system tray. |
| 89 extern const int kTrayIconSize; | 89 extern const int kTrayIconSize; |
| 90 extern const SkColor kTrayIconColor; | 90 extern const SkColor kTrayIconColor; |
| 91 | 91 |
| 92 // The size and foreground color of the icons appearing in the material design | 92 // The size and foreground color of the icons appearing in the material design |
| 93 // system menu. | 93 // system menu. |
| 94 extern const int kMenuIconSize; | 94 extern const int kMenuIconSize; |
| 95 extern const SkColor kMenuIconColor; | 95 extern const SkColor kMenuIconColor; |
| 96 extern const SkColor kMenuIconColorDisabled; |
| 96 // The size of buttons in the system menu. | 97 // The size of buttons in the system menu. |
| 97 extern const int kMenuButtonSize; | 98 extern const int kMenuButtonSize; |
| 98 // The vertical padding for the system menu separator. | 99 // The vertical padding for the system menu separator. |
| 99 extern const int kMenuSeparatorVerticalPadding; | 100 extern const int kMenuSeparatorVerticalPadding; |
| 100 // The horizontal padding for the system menu separator. | 101 // The horizontal padding for the system menu separator. |
| 101 extern const int kMenuExtraMarginFromLeftEdge; | 102 extern const int kMenuExtraMarginFromLeftEdge; |
| 102 | 103 |
| 103 enum TrayConstant { | 104 enum TrayConstant { |
| 104 // A legacy height value used in non-MD calculations for applying additional | 105 // A legacy height value used in non-MD calculations for applying additional |
| 105 // borders on tray items. | 106 // borders on tray items. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 130 int GetTrayConstant(TrayConstant constant); | 131 int GetTrayConstant(TrayConstant constant); |
| 131 | 132 |
| 132 namespace test { | 133 namespace test { |
| 133 const int kSettingsTrayItemViewId = 10000; | 134 const int kSettingsTrayItemViewId = 10000; |
| 134 const int kAccessibilityTrayItemViewId = 10001; | 135 const int kAccessibilityTrayItemViewId = 10001; |
| 135 } // namespace test | 136 } // namespace test |
| 136 | 137 |
| 137 } // namespace ash | 138 } // namespace ash |
| 138 | 139 |
| 139 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ | 140 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ |
| OLD | NEW |