| 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 28 matching lines...) Expand all Loading... |
| 39 const int kTrayMenuBottomRowPadding = 3; | 39 const int kTrayMenuBottomRowPadding = 3; |
| 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; | 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; |
| 41 const int kTrayMenuMinimumWidth = 300; | 41 const int kTrayMenuMinimumWidth = 300; |
| 42 const int kTrayMenuMinimumWidthMd = 352; | 42 const int kTrayMenuMinimumWidthMd = 352; |
| 43 | 43 |
| 44 const int kTrayPopupAutoCloseDelayInSeconds = 2; | 44 const int kTrayPopupAutoCloseDelayInSeconds = 2; |
| 45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; | 45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; |
| 46 const int kTrayPopupPaddingHorizontal = 18; | 46 const int kTrayPopupPaddingHorizontal = 18; |
| 47 const int kTrayPopupPaddingBetweenItems = 10; | 47 const int kTrayPopupPaddingBetweenItems = 10; |
| 48 const int kTrayPopupButtonEndMargin = 10; | 48 const int kTrayPopupButtonEndMargin = 10; |
| 49 const int kTrayPopupUserCardVerticalPadding = 10; | |
| 50 const int kTrayPopupLabelHorizontalPadding = 4; | 49 const int kTrayPopupLabelHorizontalPadding = 4; |
| 51 const int kTrayPopupSliderPaddingMD = 16; | 50 const int kTrayPopupSliderPaddingMD = 16; |
| 52 const int kTrayPopupLabelRightPadding = 8; | 51 const int kTrayPopupLabelRightPadding = 8; |
| 53 | 52 |
| 54 const int kTrayPopupDetailsIconWidth = 25; | 53 const int kTrayPopupDetailsIconWidth = 25; |
| 55 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; | 54 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; |
| 56 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); | 55 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); |
| 57 const int kTrayPopupScrollSeparatorHeight = 15; | 56 const int kTrayPopupScrollSeparatorHeight = 15; |
| 58 const int kTrayRoundedBorderRadius = 2; | 57 const int kTrayRoundedBorderRadius = 2; |
| 59 | 58 |
| 60 const int kTrayToggleButtonWidth = 68; | 59 const int kTrayToggleButtonWidth = 68; |
| 61 | 60 |
| 62 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); | 61 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); |
| 63 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); | 62 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); |
| 64 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6); | |
| 65 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); | 63 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); |
| 66 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; | 64 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; |
| 67 | 65 |
| 68 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); | 66 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); |
| 69 | 67 |
| 70 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa); | 68 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa); |
| 71 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb); | 69 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb); |
| 72 const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd); | 70 const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd); |
| 73 | 71 |
| 74 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); | 72 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 case TRAY_IME_MENU_ICON: | 165 case TRAY_IME_MENU_ICON: |
| 168 return kTrayImeMenuIcon[mode]; | 166 return kTrayImeMenuIcon[mode]; |
| 169 case TRAY_IMAGE_ITEM_PADDING: | 167 case TRAY_IMAGE_ITEM_PADDING: |
| 170 return kTrayImageItemPadding[mode]; | 168 return kTrayImageItemPadding[mode]; |
| 171 } | 169 } |
| 172 NOTREACHED(); | 170 NOTREACHED(); |
| 173 return 0; | 171 return 0; |
| 174 } | 172 } |
| 175 | 173 |
| 176 } // namespace ash | 174 } // namespace ash |
| OLD | NEW |