Set status tray height to 37px on login screen

ash/common/system/tray/tray_background_view.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/common/system/tray/tray_background_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 178 matching lines @@
   UpdateLayout();
 }
 
 void TrayBackgroundView::TrayContainer::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
   alignment_ = alignment;
   UpdateLayout();
 }
 
-void TrayBackgroundView::TrayContainer::SetMargin(const gfx::Insets& margin) {
-  margin_ = margin;
+void TrayBackgroundView::TrayContainer::SetMargin(int main_axis_margin,
+                                                  int cross_axis_margin) {
+  main_axis_margin_ = main_axis_margin;
+  cross_axis_margin_ = cross_axis_margin;
   UpdateLayout();
 }
 
 gfx::Size TrayBackgroundView::TrayContainer::GetPreferredSize() const {
   if (size_.IsEmpty())
     return views::View::GetPreferredSize();
   return size_;
 }
 
 void TrayBackgroundView::TrayContainer::ChildPreferredSizeChanged(
     views::View* child) {
   PreferredSizeChanged();
 }
 
 void TrayBackgroundView::TrayContainer::ChildVisibilityChanged(View* child) {
   PreferredSizeChanged();
 }
 
 void TrayBackgroundView::TrayContainer::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.parent == this)
     PreferredSizeChanged();
 }
 
 void TrayBackgroundView::TrayContainer::UpdateLayout() {
+  bool is_horizontal = IsHorizontalAlignment(alignment_);
+
   // Adjust the size of status tray dark background by adding additional
   // empty border.
   views::BoxLayout::Orientation orientation =
-      IsHorizontalAlignment(alignment_) ? views::BoxLayout::kHorizontal
-                                        : views::BoxLayout::kVertical;
+      is_horizontal ? views::BoxLayout::kHorizontal
+                    : views::BoxLayout::kVertical;
   const gfx::Insets insets(
       ash::MaterialDesignController::IsShelfMaterial()
-          ? gfx::Insets(IsHorizontalAlignment(alignment_)
-                            ? gfx::Insets(0, kHitRegionPadding, 0,
-                                          kHitRegionPadding + kSeparatorWidth)
-                            : gfx::Insets(kHitRegionPadding, 0,
-                                          kHitRegionPadding + kSeparatorWidth,
-                                          0))
+          ? is_horizontal ? gfx::Insets(0, kHitRegionPadding, 0,
+                                        kHitRegionPadding + kSeparatorWidth)
+                          : gfx::Insets(kHitRegionPadding, 0,
+                                        kHitRegionPadding + kSeparatorWidth, 0)
           : gfx::Insets(kBackgroundAdjustPadding));
-  SetBorder(views::Border::CreateEmptyBorder(insets + margin_));
+  const gfx::Insets margin(
+      is_horizontal ? gfx::Insets(cross_axis_margin_, main_axis_margin_)
+                    : gfx::Insets(main_axis_margin_, cross_axis_margin_));
+  SetBorder(views::Border::CreateEmptyBorder(insets + margin));
+
   views::BoxLayout* layout = new views::BoxLayout(orientation, 0, 0, 0);
   layout->SetDefaultFlex(1);
+  layout->set_minimum_cross_axis_size(kTrayItemSize);
   views::View::SetLayoutManager(layout);
+
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
 TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
     : ActionableView(nullptr),
       wm_shelf_(wm_shelf),
       tray_container_(NULL),
@@ skipping 309 matching lines @@
   paint.setAntiAlias(true);
 
   const gfx::Rect bounds = horizontal_shelf ? gfx::Rect(x, y, width, height)
                                             : gfx::Rect(y, x, height, width);
   gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));
   canvas->DrawLine(horizontal_shelf ? rect.top_right() : rect.bottom_left(),
                    rect.bottom_right(), paint);
 }
 
 }  // namespace ash