Consolidate some more ash tray constants.

ash/common/system/date/date_view.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/date/date_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/strings/grit/ash_strings.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 343 matching lines @@
     columns->AddPaddingColumn(0, kVerticalClockLeftPadding);
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                        0, views::GridLayout::USE_PREF, 0, 0);
     layout->AddPaddingRow(
         0, is_material_design ? kClockLeadingPadding
                               : kTrayLabelItemVerticalPaddingVerticalAlignment);
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_hours_.get());
     layout->StartRow(0, kColumnId);
     layout->AddView(vertical_label_minutes_.get());
-    layout->AddPaddingRow(0,
-                          is_material_design
-                              ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING) +
-                                    kVerticalClockMinutesTopOffsetMD
-                              : kTrayLabelItemVerticalPaddingVerticalAlignment);
+    layout->AddPaddingRow(
+        0,
+        is_material_design
+            ? kTrayImageItemPadding + kVerticalClockMinutesTopOffsetMD
+            : kTrayLabelItemVerticalPaddingVerticalAlignment);
   }
   Layout();
 }
 
 void TimeView::SetBorderFromLayout(ClockLayout clock_layout) {
   if (clock_layout == ClockLayout::HORIZONTAL_CLOCK) {
-    SetBorder(views::CreateEmptyBorder(gfx::Insets(
-        0, UseMd() ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING)
-                   : kTrayLabelItemHorizontalPaddingBottomAlignment)));
+    SetBorder(views::CreateEmptyBorder(
+        gfx::Insets(0,
+                    UseMd() ? kTrayImageItemPadding
+                            : kTrayLabelItemHorizontalPaddingBottomAlignment)));
   } else {
     SetBorder(views::NullBorder());
   }
 }
 
 void TimeView::SetupLabels() {
   horizontal_label_.reset(new views::Label());
   SetupLabel(horizontal_label_.get());
   vertical_label_hours_.reset(new views::Label());
   SetupLabel(vertical_label_hours_.get());
@@ skipping 10 matching lines @@
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   label->SetElideBehavior(gfx::NO_ELIDE);
 }
 
 }  // namespace tray
 }  // namespace ash