[Chrome OS MD] Update spacing between material design icons in the system tray

ash/common/system/tray/tray_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_utils.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
@@ skipping 17 matching lines @@
         gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD));
     label->SetShadows(gfx::ShadowValues(
         1,
         gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0))));
     label->SetAutoColorReadabilityEnabled(false);
     label->SetEnabledColor(SK_ColorWHITE);
     label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   }
 }
 
+// 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));
   }
 }
 
 void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment) {
   if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
         kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
@@ skipping 19 matching lines @@
   // Do not descend into static text labels which may compute their own labels
   // recursively.
   if (temp_state.role == ui::AX_ROLE_STATIC_TEXT)
     return;
 
   for (int i = 0; i < view->child_count(); ++i)
     GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels);
 }
 
 }  // namespace ash