Consolidate some more ash tray constants.

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 23 matching lines @@
     label->SetAutoColorReadabilityEnabled(false);
     label->SetEnabledColor(SK_ColorWHITE);
     label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   }
 }
 
 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) {
   if (MaterialDesignController::IsShelfMaterial())
     return;
 
-  const int tray_image_item_padding = GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
   if (IsHorizontalAlignment(alignment)) {
-    tray_view->SetBorder(views::CreateEmptyBorder(0, tray_image_item_padding, 0,
-                                                  tray_image_item_padding));
+    tray_view->SetBorder(
+        views::CreateEmptyBorder(gfx::Insets(0, kTrayImageItemPadding)));
   } else {
-    tray_view->SetBorder(views::CreateEmptyBorder(
-        tray_image_item_padding,
-        kTrayImageItemHorizontalPaddingVerticalAlignment,
-        tray_image_item_padding,
-        kTrayImageItemHorizontalPaddingVerticalAlignment));
+    tray_view->SetBorder(views::CreateEmptyBorder(gfx::Insets(
+        kTrayImageItemPadding,
+        kTrayImageItemHorizontalPaddingVerticalAlignment)));
   }
 }
 
 void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment) {
   if (MaterialDesignController::IsShelfMaterial())
     return;
 
   if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::CreateEmptyBorder(
         0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
         kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
     // Center the label for vertical launcher alignment.
     int horizontal_padding =
         std::max(0, (tray_view->GetPreferredSize().width() -
                      tray_view->label()->GetPreferredSize().width()) /
                         2);
     tray_view->SetBorder(views::CreateEmptyBorder(
         kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding,
         kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding));
   }
 }
 
 }  // namespace ash