Update shelf spacing in Chrome OS according to the MD specs

ash/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/system/tray/tray_background_view.h"
 
+#include "ash/material_design/material_design_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 170 matching lines @@
 
 void TrayBackgroundView::TrayContainer::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.parent == this)
     PreferredSizeChanged();
 }
 
 void TrayBackgroundView::TrayContainer::UpdateLayout() {
   // Adjust the size of status tray dark background by adding additional
   // empty border.
-  if (wm::IsHorizontalAlignment(alignment_)) {
-    SetBorder(views::Border::CreateEmptyBorder(
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf));
+  views::BoxLayout::Orientation orientation =
+      wm::IsHorizontalAlignment(alignment_) ? views::BoxLayout::kHorizontal
+                                            : views::BoxLayout::kVertical;
+  SetBorder(views::Border::CreateEmptyBorder(
+      kAdjustBackgroundPadding, kAdjustBackgroundPadding,
+      kAdjustBackgroundPadding, kAdjustBackgroundPadding));
 
-    views::BoxLayout* layout =
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
-    layout->SetDefaultFlex(1);
-    views::View::SetLayoutManager(layout);
-  } else {
-    SetBorder(views::Border::CreateEmptyBorder(
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf));
-
-    views::BoxLayout* layout =
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
-    layout->SetDefaultFlex(1);
-    views::View::SetLayoutManager(layout);
-  }
+  views::BoxLayout* layout = new views::BoxLayout(orientation, 0, 0, 0);
+  layout->SetDefaultFlex(1);
+  views::View::SetLayoutManager(layout);
   PreferredSizeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
 TrayBackgroundView::TrayBackgroundView(StatusAreaWidget* status_area_widget)
     : status_area_widget_(status_area_widget),
       tray_container_(NULL),
       shelf_alignment_(wm::SHELF_ALIGNMENT_BOTTOM),
@@ skipping 175 matching lines @@
   return status_area_widget()->shelf_widget()->shelf_layout_manager();
 }
 
 void TrayBackgroundView::SetShelfAlignment(wm::ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
   SetTrayBorder();
   tray_container_->SetAlignment(alignment);
 }
 
 void TrayBackgroundView::SetTrayBorder() {
-  views::View* parent = status_area_widget_->status_area_widget_delegate();
-  // Tray views are laid out right-to-left or bottom-to-top
-  bool on_edge = (this == parent->child_at(0));
-  int left_edge, top_edge, right_edge, bottom_edge;
-  if (wm::IsHorizontalAlignment(shelf_alignment())) {
-    top_edge = ShelfLayoutManager::kShelfItemInset;
-    left_edge = 0;
-    bottom_edge = kShelfSize -
-        ShelfLayoutManager::kShelfItemInset - kShelfItemHeight;
-    right_edge = on_edge ? kPaddingFromEdgeOfShelf : 0;
-  } else if (shelf_alignment() == wm::SHELF_ALIGNMENT_LEFT) {
-    top_edge = 0;
-    left_edge = kShelfSize -
-        ShelfLayoutManager::kShelfItemInset - kShelfItemHeight;
-    bottom_edge = on_edge ? kPaddingFromEdgeOfShelf : 0;
-    right_edge = ShelfLayoutManager::kShelfItemInset;
-  } else { // SHELF_ALIGNMENT_RIGHT
-    top_edge = 0;
-    left_edge = ShelfLayoutManager::kShelfItemInset;
-    bottom_edge = on_edge ? kPaddingFromEdgeOfShelf : 0;
-    right_edge = kShelfSize -
-        ShelfLayoutManager::kShelfItemInset - kShelfItemHeight;
-  }
-  SetBorder(views::Border::CreateEmptyBorder(
-      top_edge, left_edge, bottom_edge, right_edge));
+  gfx::Insets inset;
+  GetHitRegionInsets(inset);
+
+  SetBorder(views::Border::CreateEmptyBorder(inset.top(), inset.left(),
+                                             inset.bottom(), inset.right()));
 }
 
 void TrayBackgroundView::OnImplicitAnimationsCompleted() {
   // If there is another animation in the queue, the reverse animation was
   // triggered before the completion of animating to invisible. Do not turn off
   // the visibility so that the next animation may render. The value of
   // layer()->GetTargetVisibility() can be incorrect if the hide animation was
   // aborted to schedule an animation to become visible. As the new animation
   // is not yet added to the queue. crbug.com/374236
   if(layer()->GetAnimator()->is_animating() ||
@@ skipping 131 matching lines @@
   else
     background_->set_alpha(kTrayBackgroundAlpha);
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
+void TrayBackgroundView::GetHitRegionInsets(gfx::Insets& insets) {
+  int top_edge, left_edge, bottom_edge, right_edge;
+  // Tray views are laid out right-to-left or bottom-to-top
+  if (MaterialDesignController::IsShelfMaterial()) {
+    if (wm::IsHorizontalAlignment(shelf_alignment())) {
+      top_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      left_edge = 0;
+      bottom_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      right_edge = 0;
+    } else {  // SHELF_ALIGNMENT_LEFT || SHELF_ALIGNMENT_RIGHT
+      top_edge = 0;
+      left_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      bottom_edge = 0;
+      right_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+    }
+  } else {
+    views::View* parent = status_area_widget_->status_area_widget_delegate();
+    bool on_edge = (this == parent->child_at(0));
+
+    if (wm::IsHorizontalAlignment(shelf_alignment())) {
+      top_edge = kShelfItemInset;
+      left_edge = 0;
+      bottom_edge = GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemInset -
+                    kShelfItemHeight;
+      right_edge = on_edge ? GetTrayConstant(PADDING_FROM_EDGE_OF_SHELF) : 0;
+    } else if (shelf_alignment() == wm::SHELF_ALIGNMENT_LEFT) {
+      top_edge = 0;
+      left_edge = GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemInset -
+                  kShelfItemHeight;
+      bottom_edge = on_edge ? GetTrayConstant(PADDING_FROM_EDGE_OF_SHELF) : 0;
+      right_edge = kShelfItemInset;
+    } else {  // SHELF_ALIGNMENT_RIGHT
+      top_edge = 0;
+      left_edge = kShelfItemInset;
+      bottom_edge = on_edge ? GetTrayConstant(PADDING_FROM_EDGE_OF_SHELF) : 0;
+      right_edge = GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemInset -
+                   kShelfItemHeight;
+    }
+  }
+  insets.Set(top_edge, left_edge, bottom_edge, right_edge);
+}
 }  // namespace ash