| 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 #include "ash/common/system/tray/tray_constants.h" | 5 #include "ash/common/system/tray/tray_constants.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "third_party/skia/include/core/SkColor.h" | 9 #include "third_party/skia/include/core/SkColor.h" |
| 10 #include "ui/gfx/color_palette.h" | 10 #include "ui/gfx/color_palette.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 // Vertical padding between status tray items when the shelf is vertical. | 36 // Vertical padding between status tray items when the shelf is vertical. |
| 37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; | 37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; |
| 38 | 38 |
| 39 const int kTrayMenuBottomRowPadding = 5; | 39 const int kTrayMenuBottomRowPadding = 5; |
| 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; | 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; |
| 41 | 41 |
| 42 const int kTrayPopupAutoCloseDelayInSeconds = 2; | 42 const int kTrayPopupAutoCloseDelayInSeconds = 2; |
| 43 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; | 43 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; |
| 44 const int kTrayPopupPaddingHorizontal = 18; | 44 const int kTrayPopupPaddingHorizontal = 18; |
| 45 const int kTrayPopupPaddingBetweenItems = 10; | 45 const int kTrayPopupPaddingBetweenItems = 10; |
| 46 const int kTrayPopupButtonEndMargin = 10; |
| 47 const int kTrayPopupTextSpacingVertical = 4; |
| 46 const int kTrayPopupUserCardVerticalPadding = 10; | 48 const int kTrayPopupUserCardVerticalPadding = 10; |
| 47 const int kTrayPopupLabelHorizontalPadding = 4; | 49 const int kTrayPopupLabelHorizontalPadding = 4; |
| 48 const int kTrayPopupSliderPaddingMD = 16; | 50 const int kTrayPopupSliderPaddingMD = 16; |
| 49 | 51 |
| 50 const int kTrayPopupDetailsIconWidth = 25; | 52 const int kTrayPopupDetailsIconWidth = 25; |
| 51 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; | 53 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; |
| 52 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); | 54 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); |
| 53 const int kTrayPopupScrollSeparatorHeight = 15; | 55 const int kTrayPopupScrollSeparatorHeight = 15; |
| 54 const int kTrayRoundedBorderRadius = 2; | 56 const int kTrayRoundedBorderRadius = 2; |
| 55 | 57 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 case TRAY_IME_MENU_ICON: | 146 case TRAY_IME_MENU_ICON: |
| 145 return kTrayImeMenuIcon[mode]; | 147 return kTrayImeMenuIcon[mode]; |
| 146 case TRAY_IMAGE_ITEM_PADDING: | 148 case TRAY_IMAGE_ITEM_PADDING: |
| 147 return kTrayImageItemPadding[mode]; | 149 return kTrayImageItemPadding[mode]; |
| 148 } | 150 } |
| 149 NOTREACHED(); | 151 NOTREACHED(); |
| 150 return 0; | 152 return 0; |
| 151 } | 153 } |
| 152 | 154 |
| 153 } // namespace ash | 155 } // namespace ash |
| OLD | NEW |