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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 const int kMenuSeparatorVerticalPadding = 4; | 85 const int kMenuSeparatorVerticalPadding = 4; |
86 const int kMenuExtraMarginFromLeftEdge = 4; | 86 const int kMenuExtraMarginFromLeftEdge = 4; |
87 | 87 |
88 const int kHitRegionPadding = 4; | 88 const int kHitRegionPadding = 4; |
89 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); | 89 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); |
90 const int kSeparatorWidth = 1; | 90 const int kSeparatorWidth = 1; |
91 | 91 |
92 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); | 92 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); |
93 const int kHorizontalSeparatorHeight = 24; | 93 const int kHorizontalSeparatorHeight = 24; |
94 | 94 |
| 95 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; |
| 96 const float kTrayPopupInkDropRippleOpacity = 0.06f; |
| 97 const float kTrayPopupInkDropHighlightOpacity = 0.08f; |
| 98 const int kTrayPopupInkDropInset = 4; |
| 99 |
95 int GetTrayConstant(TrayConstant constant) { | 100 int GetTrayConstant(TrayConstant constant) { |
96 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize}; | 101 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize}; |
97 const int kTraySpacing[] = {4, 4, 0}; | 102 const int kTraySpacing[] = {4, 4, 0}; |
98 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4}; | 103 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4}; |
99 const int kTrayPopupItemHeight[] = {46, 46, 48}; | 104 const int kTrayPopupItemHeight[] = {46, 46, 48}; |
100 // TODO(bruthig): Use the correct values for non-material design. | 105 // TODO(bruthig): Use the correct values for non-material design. |
101 const int kTrayPopupItemLeftInset[] = {0, 0, 4}; | 106 const int kTrayPopupItemLeftInset[] = {0, 0, 4}; |
102 // TODO(bruthig): Use the correct values for non-material design. | 107 // TODO(bruthig): Use the correct values for non-material design. |
103 const int kTrayPopupItemRightInset[] = {0, 0, 4}; | 108 const int kTrayPopupItemRightInset[] = {0, 0, 4}; |
104 // TODO(bruthig): Use the correct values for non-material design. | 109 // TODO(bruthig): Use the correct values for non-material design. |
(...skipping 30 matching lines...) Expand all Loading... |
135 case TRAY_IME_MENU_ICON: | 140 case TRAY_IME_MENU_ICON: |
136 return kTrayImeMenuIcon[mode]; | 141 return kTrayImeMenuIcon[mode]; |
137 case TRAY_IMAGE_ITEM_PADDING: | 142 case TRAY_IMAGE_ITEM_PADDING: |
138 return kTrayImageItemPadding[mode]; | 143 return kTrayImageItemPadding[mode]; |
139 } | 144 } |
140 NOTREACHED(); | 145 NOTREACHED(); |
141 return 0; | 146 return 0; |
142 } | 147 } |
143 | 148 |
144 } // namespace ash | 149 } // namespace ash |
OLD | NEW |