Update shelf spacing in Chrome OS according to the MD specs

ash/system/tray/tray_background_view.cc

Index: ash/system/tray/tray_background_view.cc
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 1f2cf2628582753c3e73b8a86ab5d18a1b8b71ab..10041a3a4375fdf8fb2a42f3c07fe7b0831d63c9 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -196,10 +197,8 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
   // empty border.
   if (wm::IsHorizontalAlignment(alignment_)) {
     SetBorder(views::Border::CreateEmptyBorder(

[bruthig, 2016/05/25 20:24:52]

There appears to be quite a bit of duplicated code here.  From what I can tell
the only difference between the 'if' and the 'else' is the first parameter
passed to BoxLayout() c'tor.

Feel free to simplify this code :)

[yiyix, 2016/06/02 03:54:53]

Done.

-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf));
+        kEmptyBoarderPadding, kEmptyBoarderPadding, kEmptyBoarderPadding,
+        kEmptyBoarderPadding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
@@ -207,10 +206,8 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
     views::View::SetLayoutManager(layout);
   } else {
     SetBorder(views::Border::CreateEmptyBorder(
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf,
-        kPaddingFromEdgeOfShelf));
+        kEmptyBoarderPadding, kEmptyBoarderPadding, kEmptyBoarderPadding,
+        kEmptyBoarderPadding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
@@ -416,24 +413,63 @@ void TrayBackgroundView::SetTrayBorder() {
   // 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;
+
+  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 =
+          on_edge
+              ? GetShelfStatusAreaInset(PADDING_FROM_EDGE_TO_OVERVIEW_BUTTON)

[tdanderson, 2016/05/26 22:55:56]

I think I have a better idea of what's happening here. Let's discuss in person
tomorrow.

[yiyix, 2016/06/02 03:54:53]

We have discussed it in person earlier this week.

+              : 0;
+    } else {  // SHELF_ALIGNMENT_LEFT || SHELF_ALIGNMENT_RIGHT
+      top_edge = 0;
+      left_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      bottom_edge =
+          on_edge
+              ? GetShelfStatusAreaInset(PADDING_FROM_EDGE_TO_OVERVIEW_BUTTON)
+              : 0;
+      right_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+    }
+  } else {
+    if (wm::IsHorizontalAlignment(shelf_alignment())) {
+      top_edge = ShelfLayoutManager::GetShelfItemInset(
+          ShelfLayoutManager::SHELF_ITEM_INSET);
+      left_edge = 0;
+      bottom_edge = GetShelfLayoutConstant(SHELF_SIZE) -
+                    ShelfLayoutManager::GetShelfItemInset(
+                        ShelfLayoutManager::SHELF_ITEM_INSET) -
+                    kShelfItemHeight;
+      right_edge =
+          on_edge
+              ? GetShelfStatusAreaInset(PADDING_FROM_EDGE_TO_OVERVIEW_BUTTON)
+              : 0;
+    } else if (shelf_alignment() == wm::SHELF_ALIGNMENT_LEFT) {
+      top_edge = 0;
+      left_edge = GetShelfLayoutConstant(SHELF_SIZE) -
+                  ShelfLayoutManager::GetShelfItemInset(
+                      ShelfLayoutManager::SHELF_ITEM_INSET) -
+                  kShelfItemHeight;
+      bottom_edge =
+          on_edge
+              ? GetShelfStatusAreaInset(PADDING_FROM_EDGE_TO_OVERVIEW_BUTTON)
+              : 0;
+      right_edge = ShelfLayoutManager::GetShelfItemInset(
+          ShelfLayoutManager::SHELF_ITEM_INSET);
+    } else {  // SHELF_ALIGNMENT_RIGHT
+      top_edge = 0;
+      left_edge = ShelfLayoutManager::GetShelfItemInset(
+          ShelfLayoutManager::SHELF_ITEM_INSET);
+      bottom_edge =
+          on_edge
+              ? GetShelfStatusAreaInset(PADDING_FROM_EDGE_TO_OVERVIEW_BUTTON)
+              : 0;
+      right_edge = GetShelfLayoutConstant(SHELF_SIZE) -
+                   ShelfLayoutManager::GetShelfItemInset(
+                       ShelfLayoutManager::SHELF_ITEM_INSET) -
+                   kShelfItemHeight;
+    }
   }
   SetBorder(views::Border::CreateEmptyBorder(
       top_edge, left_edge, bottom_edge, right_edge));