Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

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/shell.h"
@@ skipping 71 matching lines @@
 
 void StatusAreaWidgetDelegate::UpdateLayout() {
   // Use a grid layout so that the trays can be centered in each cell, and
   // so that the widget gets laid out correctly when tray sizes change.
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   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, GetTraySpacing());
       is_first_visible_child = false;
       columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL,
                          0, /* resize percent */
                          views::GridLayout::USE_PREF, 0, 0);
     }
     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 {
+    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);
     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, GetTraySpacing());
@@ skipping 15 matching lines @@
   UpdateLayout();
 }
 
 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
   if (GetWidget())
     GetWidget()->SetSize(GetPreferredSize());
 }
 
 }  // namespace internal
 }  // namespace ash