Chromium Code Reviews| Index: ash/common/system/tray/tray_constants.cc |
| diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc |
| index ac3247910d884cfa4848c7c7565d2eaaf3b123db..46e6668e10f9857a7f67c2e10251f24b4aa4b872 100644 |
| --- a/ash/common/system/tray/tray_constants.cc |
| +++ b/ash/common/system/tray/tray_constants.cc |
| @@ -105,9 +105,9 @@ int GetTrayConstant(TrayConstant constant) { |
| const int kTrayPopupItemHeight[] = {46, 48, 48}; |
| // FixedSizedImageViews use the contained ImageView's width for 0 values. |
| const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48}; |
| - // FixedSizedImageViews use the contained ImageView's width for 0 values. |
| - const int kTrayPopupItemMoreImageRegionWidth[] = {0, 20, 20}; |
| - const int kTrayPopupItemLeftInset[] = {0, 0, 4}; |
| + const int kTrayPopupItemMoreImageSize[] = {25, 20, 20}; |
|
tdanderson
2016/11/09 01:38:33
Consider using kMenuIconSize in place of the liter
bruthig
2016/11/10 02:54:54
Done.
|
| + const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10}; |
| + const int kTrayPopupItemLeftInset[] = {0, 4, 4}; |
|
tdanderson
2016/11/09 01:38:33
Good catch
|
| const int kTrayPopupItemRightInset[] = {0, 0, 0}; |
| const int kTrayPopupItemMinStartWidth[] = {46, 48, 48}; |
| const int kTrayPopupItemMinEndWidth[] = {40, 40, 40}; |
| @@ -130,8 +130,10 @@ int GetTrayConstant(TrayConstant constant) { |
| return kTrayPopupItemHeight[mode]; |
| case TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH: |
| return kTrayPopupItemMainImageRegionWidth[mode]; |
| - case TRAY_POPUP_ITEM_MORE_IMAGE_CONTAINER_WIDTH: |
| - return kTrayPopupItemMoreImageRegionWidth[mode]; |
| + case TRAY_POPUP_ITEM_MORE_IMAGE_SIZE: |
| + return kTrayPopupItemMoreImageSize[mode]; |
| + case TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET: |
| + return kTrayPopupItemMoreRegionHorizontalInset[mode]; |
| case TRAY_POPUP_ITEM_LEFT_INSET: |
| return kTrayPopupItemLeftInset[mode]; |
| case TRAY_POPUP_ITEM_RIGHT_INSET: |