| Index: ash/common/system/tray/tray_utils.cc
|
| diff --git a/ash/common/system/tray/tray_utils.cc b/ash/common/system/tray/tray_utils.cc
|
| index 2a19fab0ee98c1e499c7ebbdb07f2e57b49de34f..d7c9dd21669267c0b4ceb8774f2994b59b070847 100644
|
| --- a/ash/common/system/tray/tray_utils.cc
|
| +++ b/ash/common/system/tray/tray_utils.cc
|
| @@ -35,16 +35,19 @@ void SetupLabelForTray(views::Label* label) {
|
| }
|
| }
|
|
|
| +// TODO(yiyix): Instead of using a fixed padding beside each tray item, take
|
| +// internal icon padding into account when adjusting tray icon spacing. See
|
| +// crbug.com/653292.
|
| void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) {
|
| + const int tray_image_item_padding = GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
|
| if (IsHorizontalAlignment(alignment)) {
|
| tray_view->SetBorder(views::Border::CreateEmptyBorder(
|
| - 0, kTrayImageItemHorizontalPaddingBottomAlignment, 0,
|
| - kTrayImageItemHorizontalPaddingBottomAlignment));
|
| + 0, tray_image_item_padding, 0, tray_image_item_padding));
|
| } else {
|
| tray_view->SetBorder(views::Border::CreateEmptyBorder(
|
| - kTrayImageItemVerticalPaddingVerticalAlignment,
|
| + tray_image_item_padding,
|
| kTrayImageItemHorizontalPaddingVerticalAlignment,
|
| - kTrayImageItemVerticalPaddingVerticalAlignment,
|
| + tray_image_item_padding,
|
| kTrayImageItemHorizontalPaddingVerticalAlignment));
|
| }
|
| }
|
|
|