Revert of Shelf Cleanup (- binary files)

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 8f88e3c0aa85199b635705564fbcdbd6ad31dc41..72a289db50e470d7d066a9b464e1961f0e0e11a9 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -21,6 +21,11 @@
 
 namespace ash {
 namespace internal {
+namespace {
+
+const int kStatusTrayOffsetFromScreenEdge = 4;
+
+}
 
 StatusAreaWidgetDelegate::StatusAreaWidgetDelegate()
     : focus_cycler_for_testing_(NULL),
@@ -84,13 +89,20 @@
   views::ColumnSet* columns = layout->AddColumnSet(0);
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM ||
       alignment_ == SHELF_ALIGNMENT_TOP) {
+    // Alternate shelf layout insets are all handled by tray_background_view.
+    if (!ash::switches::UseAlternateShelfLayout()) {
+      if (alignment_ == SHELF_ALIGNMENT_TOP)
+        layout->SetInsets(kStatusTrayOffsetFromScreenEdge, 0, 0, 0);
+      else
+        layout->SetInsets(0, 0, kStatusTrayOffsetFromScreenEdge, 0);
+    }
     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, GetTraySpacing());
       is_first_visible_child = false;
       columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL,
                          0, /* resize percent */
@@ -103,6 +115,12 @@
         layout->AddView(child);
     }
   } else {
+    if (!ash::switches::UseAlternateShelfLayout()) {
+      if (alignment_ == SHELF_ALIGNMENT_LEFT)
+        layout->SetInsets(0, kStatusTrayOffsetFromScreenEdge, 0, 0);
+      else
+        layout->SetInsets(0, 0, 0, kStatusTrayOffsetFromScreenEdge);
+    }
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                        0, /* resize percent */
                        views::GridLayout::USE_PREF, 0, 0);
@@ -112,7 +130,7 @@
       if (!child->visible())
         continue;
       if (!is_first_visible_child)
-        layout->AddPaddingRow(0, kTraySpacing);
+        layout->AddPaddingRow(0, GetTraySpacing());
       is_first_visible_child = false;
       layout->StartRow(0, 0);
       layout->AddView(child);