Fix status area tray spacing.

ash/system/status_area_widget_delegate.cc

Index: ash/system/status_area_widget_delegate.cc
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index 66622cbff2828acfe89e0cf18581fb7fae2229c3..96d63b4c0da8533ea57531153d76b5e31556947b 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -8,6 +8,7 @@
 #include "ash/focus_cycler.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/system/tray/tray_constants.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
@@ -20,7 +21,7 @@
 
 namespace {
 
-int kTraySpacing = 1;
+int kTraySpacing = 8;
 
 }  // namespace
 
@@ -95,19 +96,30 @@ void StatusAreaWidgetDelegate::UpdateLayout() {
                          0, /* resize percent */
                          views::GridLayout::USE_PREF, 0, 0);
     }
+    columns->AddPaddingColumn(0, kPaddingFromRightEdgeOfScreenBottomAlignment);
     layout->StartRow(0, 0);
     for (int c = 0; c < child_count(); ++c)
       layout->AddView(child_at(c));
+    layout->AddPaddingRow(0, kPaddingFromBottomOfScreenBottomAlignment);
   } else {
+    columns->AddPaddingColumn(
+        0, (alignment_ == SHELF_ALIGNMENT_LEFT) ?
+        kPaddingFromOuterEdgeOfLauncherVerticalAlignment :
+        kPaddingFromInnerEdgeOfLauncherVerticalAlignment);
     columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
                        0, /* resize percent */
                        views::GridLayout::USE_PREF, 0, 0);
+    columns->AddPaddingColumn(
+        0, (alignment_ == SHELF_ALIGNMENT_LEFT) ?
+        kPaddingFromInnerEdgeOfLauncherVerticalAlignment :
+        kPaddingFromOuterEdgeOfLauncherVerticalAlignment);
     for (int c = 0; c < child_count(); ++c) {
       if (c != 0)
         layout->AddPaddingRow(0, kTraySpacing);
       layout->StartRow(0, 0);
       layout->AddView(child_at(c));
     }
+    layout->AddPaddingRow(0, kPaddingFromBottomOfScreenVerticalAlignment);
   }
   Layout();
   UpdateWidgetSize();