| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 | 100 |
| 101 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); | 101 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); |
| 102 const int kHorizontalSeparatorHeight = 24; | 102 const int kHorizontalSeparatorHeight = 24; |
| 103 | 103 |
| 104 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; | 104 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; |
| 105 const float kTrayPopupInkDropRippleOpacity = 0.06f; | 105 const float kTrayPopupInkDropRippleOpacity = 0.06f; |
| 106 const float kTrayPopupInkDropHighlightOpacity = 0.08f; | 106 const float kTrayPopupInkDropHighlightOpacity = 0.08f; |
| 107 const int kTrayPopupInkDropInset = 4; | 107 const int kTrayPopupInkDropInset = 4; |
| 108 const int kTrayPopupInkDropCornerRadius = 2; | 108 const int kTrayPopupInkDropCornerRadius = 2; |
| 109 | 109 |
| 110 const int kTrayPopupSystemInfoRowHeight = 40; |
| 111 |
| 110 int GetTrayConstant(TrayConstant constant) { | 112 int GetTrayConstant(TrayConstant constant) { |
| 111 const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize}; | 113 const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize}; |
| 112 const int kTraySpacing[] = {4, 0, 0}; | 114 const int kTraySpacing[] = {4, 0, 0}; |
| 113 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 3}; | 115 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 3}; |
| 114 const int kTrayPopupItemMinHeight[] = {46, 48, 48}; | 116 const int kTrayPopupItemMinHeight[] = {46, 48, 48}; |
| 115 const int kTrayPopupItemMaxHeight[] = {138, 144, 144}; | 117 const int kTrayPopupItemMaxHeight[] = {138, 144, 144}; |
| 116 // FixedSizedImageViews use the contained ImageView's width for 0 values. | 118 // FixedSizedImageViews use the contained ImageView's width for 0 values. |
| 117 const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48}; | 119 const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48}; |
| 118 const int kTrayPopupItemMoreImageSize[] = {25, kMenuIconSize, kMenuIconSize}; | 120 const int kTrayPopupItemMoreImageSize[] = {25, kMenuIconSize, kMenuIconSize}; |
| 119 const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10}; | 121 const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10}; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 case TRAY_IME_MENU_ICON: | 167 case TRAY_IME_MENU_ICON: |
| 166 return kTrayImeMenuIcon[mode]; | 168 return kTrayImeMenuIcon[mode]; |
| 167 case TRAY_IMAGE_ITEM_PADDING: | 169 case TRAY_IMAGE_ITEM_PADDING: |
| 168 return kTrayImageItemPadding[mode]; | 170 return kTrayImageItemPadding[mode]; |
| 169 } | 171 } |
| 170 NOTREACHED(); | 172 NOTREACHED(); |
| 171 return 0; | 173 return 0; |
| 172 } | 174 } |
| 173 | 175 |
| 174 } // namespace ash | 176 } // namespace ash |
| OLD | NEW |