Fix status area tray spacing.

ash/system/status_area_widget_delegate.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/status_area_widget_delegate.h"
 
 #include "ash/ash_export.h"
 #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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
-int kTraySpacing = 1;
+int kTraySpacing = 8;
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
     : focus_cycler_for_testing_(NULL),
       alignment_(SHELF_ALIGNMENT_BOTTOM) {
 }
@@ skipping 54 matching lines @@
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM) {
     for (int c = 0; c < child_count(); ++c) {
       if (c != 0)
         columns->AddPaddingColumn(0, kTraySpacing);
       columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
                          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();
 }
 
 void StatusAreaWidgetDelegate::ChildPreferredSizeChanged(View* child) {
   // Need to resize the window when trays or items are added/removed.
   UpdateWidgetSize();
 }
 
 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
   if (GetWidget())
     GetWidget()->SetSize(GetPreferredSize());
 }
 
 }  // namespace internal
 }  // namespace ash