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