Make spacing between uber tray items consistent with UI spec.

ash/system/tray/tray_views.cc

Index: ash/system/tray/tray_views.cc
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index 573f58dbbcba91b3215b703ee734c58aa7078c36..a3f1af10ee6c63c3300a2136704aa39357415156 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -5,6 +5,7 @@
 #include "ash/system/tray/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_item_view.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ -524,5 +525,38 @@ void SetupLabelForTray(views::Label* label) {
   label->SetShadowOffset(0, 1);
 }
 
+void SetTrayImageItemBorder(views::View* tray_view,
+                            ShelfAlignment alignment) {
+  if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+    tray_view->set_border(views::Border::CreateEmptyBorder(
+        0, kTrayImageItemHorizontalPaddingBottomAlignment,
+        0, kTrayImageItemHorizontalPaddingBottomAlignment));
+  } else {
+    tray_view->set_border(views::Border::CreateEmptyBorder(
+        kTrayImageItemVerticalPaddingVerticalAlignment,
+        kTrayImageItemHorizontalPaddingVerticalAlignment,
+        kTrayImageItemVerticalPaddingVerticalAlignment,
+        kTrayImageItemHorizontalPaddingVerticalAlignment));
+  }
+}
+
+void SetTrayLabelItemBorder(TrayItemView* tray_view,
+                            ShelfAlignment alignment) {
+  if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+    tray_view->set_border(views::Border::CreateEmptyBorder(
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment,
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment));
+  } else {
+    // Center the label for vertical launcher alignment.
+    int horizontal_padding = (tray_view->GetPreferredSize().width() -
+        tray_view->label()->GetPreferredSize().width()) / 2;
+    tray_view->set_border(views::Border::CreateEmptyBorder(
+        kTrayLabelItemVerticalPaddingVeriticalAlignment,
+        horizontal_padding,
+        kTrayLabelItemVerticalPaddingVeriticalAlignment,
+        horizontal_padding));
+  }
+}
+
 }  // namespace internal
 }  // namespace ash