| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 const int kTrayPopupLabelHorizontalPadding = 4; | 48 const int kTrayPopupLabelHorizontalPadding = 4; |
| 49 const int kTrayPopupSliderPaddingMD = 16; | 49 const int kTrayPopupSliderPaddingMD = 16; |
| 50 const int kTrayPopupLabelRightPadding = 8; | 50 const int kTrayPopupLabelRightPadding = 8; |
| 51 | 51 |
| 52 const int kTrayPopupDetailsIconWidth = 25; | 52 const int kTrayPopupDetailsIconWidth = 25; |
| 53 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; | 53 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; |
| 54 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); | 54 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); |
| 55 const int kTrayPopupScrollSeparatorHeight = 15; | 55 const int kTrayPopupScrollSeparatorHeight = 15; |
| 56 const int kTrayRoundedBorderRadius = 2; | 56 const int kTrayRoundedBorderRadius = 2; |
| 57 | 57 |
| 58 const int kTrayToggleButtonWidth = 68; |
| 59 |
| 58 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); | 60 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); |
| 59 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); | 61 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3); |
| 60 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6); | 62 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6); |
| 61 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); | 63 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); |
| 62 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; | 64 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; |
| 63 | 65 |
| 64 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); | 66 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); |
| 65 | 67 |
| 66 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa); | 68 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa); |
| 67 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb); | 69 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb); |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 case TRAY_IME_MENU_ICON: | 157 case TRAY_IME_MENU_ICON: |
| 156 return kTrayImeMenuIcon[mode]; | 158 return kTrayImeMenuIcon[mode]; |
| 157 case TRAY_IMAGE_ITEM_PADDING: | 159 case TRAY_IMAGE_ITEM_PADDING: |
| 158 return kTrayImageItemPadding[mode]; | 160 return kTrayImageItemPadding[mode]; |
| 159 } | 161 } |
| 160 NOTREACHED(); | 162 NOTREACHED(); |
| 161 return 0; | 163 return 0; |
| 162 } | 164 } |
| 163 | 165 |
| 164 } // namespace ash | 166 } // namespace ash |
| OLD | NEW |