| 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 | 10 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 const int kTrayNotificationContentsWidth = | 81 const int kTrayNotificationContentsWidth = |
| 82 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + | 82 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + |
| 83 (kTrayPopupPaddingHorizontal / 2) * 3); | 83 (kTrayPopupPaddingHorizontal / 2) * 3); |
| 84 | 84 |
| 85 const int kMessageCenterBubblePadding = 4; | 85 const int kMessageCenterBubblePadding = 4; |
| 86 | 86 |
| 87 const int kTrayIconSize = 16; | 87 const int kTrayIconSize = 16; |
| 88 const SkColor kTrayIconColor = SK_ColorWHITE; | 88 const SkColor kTrayIconColor = SK_ColorWHITE; |
| 89 const int kMenuIconSize = 20; | 89 const int kMenuIconSize = 20; |
| 90 const SkColor kMenuIconColor = SkColorSetRGB(0x5A, 0x5A, 0x5A); | 90 const SkColor kMenuIconColor = SkColorSetRGB(0x5A, 0x5A, 0x5A); |
| 91 const int kMenuIconMargin = 4; |
| 92 const int kIconPadding = 14; |
| 91 | 93 |
| 92 const int kHitRegionPadding = 4; | 94 const int kHitRegionPadding = 4; |
| 93 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); | 95 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); |
| 94 const int kSeparatorWidth = 1; | 96 const int kSeparatorWidth = 1; |
| 95 | 97 |
| 96 int GetTrayConstant(TrayConstant constant) { | 98 int GetTrayConstant(TrayConstant constant) { |
| 97 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize}; | 99 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize}; |
| 98 const int kTraySpacing[] = {4, 4, 0}; | 100 const int kTraySpacing[] = {4, 4, 0}; |
| 99 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4}; | 101 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4}; |
| 100 const int kTrayPopupItemHeight[] = {46, 46, 48}; | 102 const int kTrayPopupItemHeight[] = {46, 46, 48}; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 114 case TRAY_POPUP_ITEM_HEIGHT: | 116 case TRAY_POPUP_ITEM_HEIGHT: |
| 115 return kTrayPopupItemHeight[mode]; | 117 return kTrayPopupItemHeight[mode]; |
| 116 case VIRTUAL_KEYBOARD_BUTTON_SIZE: | 118 case VIRTUAL_KEYBOARD_BUTTON_SIZE: |
| 117 return kVirtualKeyboardButtonSize[mode]; | 119 return kVirtualKeyboardButtonSize[mode]; |
| 118 } | 120 } |
| 119 NOTREACHED(); | 121 NOTREACHED(); |
| 120 return 0; | 122 return 0; |
| 121 } | 123 } |
| 122 | 124 |
| 123 } // namespace ash | 125 } // namespace ash |
| OLD | NEW |