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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 const int kMenuIconSize = 20; | 86 const int kMenuIconSize = 20; |
87 const SkColor kMenuIconColor = gfx::kChromeIconGrey; | 87 const SkColor kMenuIconColor = gfx::kChromeIconGrey; |
88 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); | 88 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); |
89 const int kMenuButtonSize = 48; | 89 const int kMenuButtonSize = 48; |
90 const int kMenuSeparatorVerticalPadding = 4; | 90 const int kMenuSeparatorVerticalPadding = 4; |
91 const int kMenuExtraMarginFromLeftEdge = 4; | 91 const int kMenuExtraMarginFromLeftEdge = 4; |
92 const int kMenuEdgeEffectivePadding = | 92 const int kMenuEdgeEffectivePadding = |
93 kMenuExtraMarginFromLeftEdge + (kMenuButtonSize - kMenuIconSize) / 2; | 93 kMenuExtraMarginFromLeftEdge + (kMenuButtonSize - kMenuIconSize) / 2; |
94 | 94 |
95 const int kHitRegionPadding = 4; | 95 const int kHitRegionPadding = 4; |
96 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99); | 96 const SkColor kTraySeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99); |
97 const int kSeparatorWidth = 1; | 97 const int kSeparatorWidth = 1; |
98 | 98 |
99 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); | 99 const SkColor kMenuSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); |
100 const int kHorizontalSeparatorHeight = 24; | |
101 | 100 |
102 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; | 101 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; |
103 const float kTrayPopupInkDropRippleOpacity = 0.06f; | 102 const float kTrayPopupInkDropRippleOpacity = 0.06f; |
104 const float kTrayPopupInkDropHighlightOpacity = 0.08f; | 103 const float kTrayPopupInkDropHighlightOpacity = 0.08f; |
105 const int kTrayPopupInkDropInset = 4; | 104 const int kTrayPopupInkDropInset = 4; |
106 const int kTrayPopupInkDropCornerRadius = 2; | 105 const int kTrayPopupInkDropCornerRadius = 2; |
107 | 106 |
108 const int kTrayPopupSystemInfoRowHeight = 40; | 107 const int kTrayPopupSystemInfoRowHeight = 40; |
109 | 108 |
110 int GetTrayConstant(TrayConstant constant) { | 109 int GetTrayConstant(TrayConstant constant) { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 case TRAY_IME_MENU_ICON: | 164 case TRAY_IME_MENU_ICON: |
166 return kTrayImeMenuIcon[mode]; | 165 return kTrayImeMenuIcon[mode]; |
167 case TRAY_IMAGE_ITEM_PADDING: | 166 case TRAY_IMAGE_ITEM_PADDING: |
168 return kTrayImageItemPadding[mode]; | 167 return kTrayImageItemPadding[mode]; |
169 } | 168 } |
170 NOTREACHED(); | 169 NOTREACHED(); |
171 return 0; | 170 return 0; |
172 } | 171 } |
173 | 172 |
174 } // namespace ash | 173 } // namespace ash |
OLD | NEW |