ash:Shelf - Update position and hit box of status area.

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 7e15b7e61ce47fa931973f47a1e9164cc456d140..c1c62f39084fbd2a9cd1c65d71c7a8da81ff5995 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -89,10 +89,13 @@ void StatusAreaWidgetDelegate::UpdateLayout() {
   views::ColumnSet* columns = layout->AddColumnSet(0);
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM ||
       alignment_ == SHELF_ALIGNMENT_TOP) {
-    if (alignment_ == SHELF_ALIGNMENT_TOP)
-      layout->SetInsets(kStatusTrayOffsetFromScreenEdge, 0, 0, 0);
-    else
-      layout->SetInsets(0, 0, kStatusTrayOffsetFromScreenEdge, 0);
+    // 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);
@@ -112,10 +115,12 @@ void StatusAreaWidgetDelegate::UpdateLayout() {
         layout->AddView(child);
     }
   } else {
-    if (alignment_ == SHELF_ALIGNMENT_LEFT)
-      layout->SetInsets(0, kStatusTrayOffsetFromScreenEdge, 0, 0);
-    else
-      layout->SetInsets(0, 0, 0, kStatusTrayOffsetFromScreenEdge);
+    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);