Make spacing between uber tray items consistent with UI spec.

ash/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/system/date/date_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 204 matching lines @@
   } else {
     RemoveChildView(label_.get());
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
     views::ColumnSet* columns = layout->AddColumnSet(0);
     columns->AddPaddingColumn(0, 6);
     columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
                        0, views::GridLayout::USE_PREF, 0, 0);
     columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
                        0, views::GridLayout::USE_PREF, 0, 0);
-    layout->AddPaddingRow(0, 4);
+    layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVeriticalAlignment);
     layout->StartRow(0, 0);
     layout->AddView(label_hour_left_.get());
     layout->AddView(label_hour_right_.get());
     layout->StartRow(0, 0);
     layout->AddView(label_minute_left_.get());
     layout->AddView(label_minute_right_.get());
-    layout->AddPaddingRow(0, 4);
+    layout->AddPaddingRow(0, kTrayLabelItemVerticalPaddingVeriticalAlignment);
   }
   Layout();
   set_focusable(true);
 }
 
 void TimeView::SetBorder(TrayDate::ClockLayout clock_layout) {
   if (clock_layout == TrayDate::HORIZONTAL_CLOCK)
-    set_border(views::Border::CreateEmptyBorder(0, 10, 0, 7));
+    set_border(views::Border::CreateEmptyBorder(
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment,
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment));
   else
     set_border(NULL);
 }
 
 void TimeView::SetupLabels() {
   label_.reset(CreateLabel());
   SetupLabel(label_.get());
   label_hour_left_.reset(CreateLabel());
   SetupLabel(label_hour_left_.get());
   label_hour_right_.reset(CreateLabel());
   SetupLabel(label_hour_right_.get());
   label_minute_left_.reset(CreateLabel());
   SetupLabel(label_minute_left_.get());
   label_minute_right_.reset(CreateLabel());
   SetupLabel(label_minute_right_.get());
   label_hour_left_->SetEnabledColor(kVerticalClockHourColor);
   label_hour_right_->SetEnabledColor(kVerticalClockHourColor);
 }
 
 void TimeView::SetupLabel(views::Label* label) {
   label->set_owned_by_client();
   SetupLabelForTray(label);
   gfx::Font font = label->font();
   label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
 }
 
 }  // namespace tray
 }  // namespace internal
 }  // namespace ash