ash:Shelf Update Alternate Layout

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"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/strings/utf_string_conversions.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"
@@ skipping 73 matching lines @@
     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, ash::switches::UseAlternateShelfLayout() ?
+            kAlternateTraySpacing : kTraySpacing);

[Mr4D (OOO till 08-26), 2013/08/06 21:10:34]

You might want to populate a variable before the first if and use it here and
down there?

[Harry McCleave, 2013/08/06 22:41:06]

Done.

       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 (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, kTraySpacing);
+        layout->AddPaddingRow(0, ash::switches::UseAlternateShelfLayout() ?
+            kAlternateTraySpacing : kTraySpacing);
       is_first_visible_child = false;
       layout->StartRow(0, 0);
       layout->AddView(child);
     }
   }
   Layout();
   UpdateWidgetSize();
 }
 
 void StatusAreaWidgetDelegate::ChildPreferredSizeChanged(View* child) {
   // Need to resize the window when trays or items are added/removed.
   UpdateWidgetSize();
 }
 
 void StatusAreaWidgetDelegate::ChildVisibilityChanged(View* child) {
   UpdateLayout();
 }
 
 void StatusAreaWidgetDelegate::UpdateWidgetSize() {
   if (GetWidget())
     GetWidget()->SetSize(GetPreferredSize());
 }
 
 }  // namespace internal
 }  // namespace ash