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