Update shelf spacing in Chrome OS according to the MD specs

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/ash_switches.h"
 #include "ash/focus_cycler.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 103 matching lines @@
   SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   if (wm::IsHorizontalAlignment(alignment_)) {
     bool is_first_visible_child = true;
     for (int c = 0; c < child_count(); ++c) {
       views::View* child = child_at(c);
       if (!child->visible())
         continue;
       if (!is_first_visible_child)
-        columns->AddPaddingColumn(0, kTraySpacing);
+        columns->AddPaddingColumn(0, GetShelfStatusAreaInset(TRAY_SPACING));
       is_first_visible_child = false;
       columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL,
                          0, /* resize percent */
                          views::GridLayout::USE_PREF, 0, 0);
     }
+    columns->AddPaddingColumn(
+        0, GetShelfStatusAreaInset(PADDING_FROM_EDGE_OF_SHELF));
     layout->StartRow(0, 0);
     for (int c = child_count() - 1; c >= 0; --c) {
       views::View* child = child_at(c);
       if (child->visible())
         layout->AddView(child);
     }
   } else {
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                        0, /* resize percent */
                        views::GridLayout::USE_PREF, 0, 0);
     bool is_first_visible_child = true;
     for (int c = child_count() - 1; c >= 0; --c) {
       views::View* child = child_at(c);
       if (!child->visible())
         continue;
       if (!is_first_visible_child)
-        layout->AddPaddingRow(0, kTraySpacing);
+        layout->AddPaddingRow(0, GetShelfStatusAreaInset(TRAY_SPACING));
       is_first_visible_child = false;
       layout->StartRow(0, 0);
       layout->AddView(child);
     }
+    layout->AddPaddingRow(0,
+                          GetShelfStatusAreaInset(PADDING_FROM_EDGE_OF_SHELF));
   }
 
   layer()->GetAnimator()->StopAnimating();
   StatusAreaWidgetDelegateAnimationSettings settings(layer());
 
   Layout();
   UpdateWidgetSize();
 }
 
 void StatusAreaWidgetDelegate::ChildPreferredSizeChanged(View* child) {
   // Need to resize the window when trays or items are added/removed.
   StatusAreaWidgetDelegateAnimationSettings settings(layer());
   UpdateWidgetSize();
 }
 
 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) {
   UpdateLayout();
 }
 
 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
   if (GetWidget())
     GetWidget()->SetSize(GetPreferredSize());
 }
 
 }  // namespace ash