| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 const int kTrayPopupMinWidth = 300; | 72 const int kTrayPopupMinWidth = 300; |
| 73 const int kTrayPopupMaxWidth = 500; | 73 const int kTrayPopupMaxWidth = 500; |
| 74 const int kNotificationIconWidth = 40; | 74 const int kNotificationIconWidth = 40; |
| 75 const int kNotificationButtonWidth = 32; | 75 const int kNotificationButtonWidth = 32; |
| 76 const int kTrayNotificationContentsWidth = | 76 const int kTrayNotificationContentsWidth = |
| 77 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + | 77 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + |
| 78 (kTrayPopupPaddingHorizontal / 2) * 3); | 78 (kTrayPopupPaddingHorizontal / 2) * 3); |
| 79 | 79 |
| 80 const int kTrayIconSize = 16; | 80 const int kTrayIconSize = 16; |
| 81 const int kTrayEdgePadding = 8; |
| 81 const SkColor kTrayIconColor = SK_ColorWHITE; | 82 const SkColor kTrayIconColor = SK_ColorWHITE; |
| 82 const int kMenuIconSize = 20; | 83 const int kMenuIconSize = 20; |
| 83 const SkColor kMenuIconColor = gfx::kChromeIconGrey; | 84 const SkColor kMenuIconColor = gfx::kChromeIconGrey; |
| 84 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); | 85 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); |
| 85 const int kMenuButtonSize = 48; | 86 const int kMenuButtonSize = 48; |
| 86 const int kMenuSeparatorVerticalPadding = 4; | 87 const int kMenuSeparatorVerticalPadding = 4; |
| 87 const int kMenuExtraMarginFromLeftEdge = 4; | 88 const int kMenuExtraMarginFromLeftEdge = 4; |
| 88 | 89 |
| 89 const int kHitRegionPadding = 4; | 90 const int kHitRegionPadding = 4; |
| 90 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99); | 91 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 case TRAY_IME_MENU_ICON: | 146 case TRAY_IME_MENU_ICON: |
| 146 return kTrayImeMenuIcon[mode]; | 147 return kTrayImeMenuIcon[mode]; |
| 147 case TRAY_IMAGE_ITEM_PADDING: | 148 case TRAY_IMAGE_ITEM_PADDING: |
| 148 return kTrayImageItemPadding[mode]; | 149 return kTrayImageItemPadding[mode]; |
| 149 } | 150 } |
| 150 NOTREACHED(); | 151 NOTREACHED(); |
| 151 return 0; | 152 return 0; |
| 152 } | 153 } |
| 153 | 154 |
| 154 } // namespace ash | 155 } // namespace ash |
| OLD | NEW |