Make spacing between uber tray items consistent with UI spec.

ash/system/tray/system_tray_item.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/tray/system_tray_item.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_item_view.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 SystemTrayItem::SystemTrayItem() {
 }
 
 SystemTrayItem::~SystemTrayItem() {
 }
 
@@ skipping 34 matching lines @@
 }
 
 void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
 }
 
 void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
   Shell::GetInstance()->system_tray()->ShowDetailedView(
       this, for_seconds, activate, BUBBLE_CREATE_NEW);
 }
 
+void SystemTrayItem::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 SystemTrayItem::SetTrayLabelItemBorder(internal::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));
+  }
+}
+
 void SystemTrayItem::SetDetailedViewCloseDelay(int for_seconds) {
   Shell::GetInstance()->system_tray()->SetDetailedViewCloseDelay(for_seconds);
 }
 
 void SystemTrayItem::HideDetailedView() {
   Shell::GetInstance()->system_tray()->HideDetailedView(this);
 }
 
 void SystemTrayItem::ShowNotificationView() {
   Shell::GetInstance()->system_tray()->ShowNotificationView(this);
 }
 
 void SystemTrayItem::HideNotificationView() {
   Shell::GetInstance()->system_tray()->HideNotificationView(this);
 }
 
 }  // namespace ash