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 20 matching lines...) Expand all Loading... |
31 // Size of tray items on the primary axis. | 31 // Size of tray items on the primary axis. |
32 const int kTrayItemSize = 32; | 32 const int kTrayItemSize = 32; |
33 | 33 |
34 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; | 34 const int kTrayLabelItemHorizontalPaddingBottomAlignment = 7; |
35 | 35 |
36 // Vertical padding between status tray items when the shelf is vertical. | 36 // Vertical padding between status tray items when the shelf is vertical. |
37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; | 37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; |
38 | 38 |
39 const int kTrayMenuBottomRowPadding = 5; | 39 const int kTrayMenuBottomRowPadding = 5; |
40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; | 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; |
| 41 const int kTrayMenuMinimumWidth = 300; |
| 42 const int kTrayMenuMinimumWidthMd = 352; |
41 | 43 |
42 const int kTrayPopupAutoCloseDelayInSeconds = 2; | 44 const int kTrayPopupAutoCloseDelayInSeconds = 2; |
43 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; | 45 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; |
44 const int kTrayPopupPaddingHorizontal = 18; | 46 const int kTrayPopupPaddingHorizontal = 18; |
45 const int kTrayPopupPaddingBetweenItems = 10; | 47 const int kTrayPopupPaddingBetweenItems = 10; |
46 const int kTrayPopupButtonEndMargin = 10; | 48 const int kTrayPopupButtonEndMargin = 10; |
47 const int kTrayPopupUserCardVerticalPadding = 10; | 49 const int kTrayPopupUserCardVerticalPadding = 10; |
48 const int kTrayPopupLabelHorizontalPadding = 4; | 50 const int kTrayPopupLabelHorizontalPadding = 4; |
49 const int kTrayPopupSliderPaddingMD = 16; | 51 const int kTrayPopupSliderPaddingMD = 16; |
50 const int kTrayPopupLabelRightPadding = 8; | 52 const int kTrayPopupLabelRightPadding = 8; |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 case TRAY_IME_MENU_ICON: | 165 case TRAY_IME_MENU_ICON: |
164 return kTrayImeMenuIcon[mode]; | 166 return kTrayImeMenuIcon[mode]; |
165 case TRAY_IMAGE_ITEM_PADDING: | 167 case TRAY_IMAGE_ITEM_PADDING: |
166 return kTrayImageItemPadding[mode]; | 168 return kTrayImageItemPadding[mode]; |
167 } | 169 } |
168 NOTREACHED(); | 170 NOTREACHED(); |
169 return 0; | 171 return 0; |
170 } | 172 } |
171 | 173 |
172 } // namespace ash | 174 } // namespace ash |
OLD | NEW |