[Chrome OS MD] Update spacing between material design icons in the system tray

ash/common/system/user/tray_user.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/user/tray_user.h"
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/system/user/user_view.h"
@@ skipping 151 matching lines @@
   if (delegate->IsUserSupervised()) {
     label_->SetText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
   } else if (status == LoginStatus::GUEST) {
     label_->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL));
   }
 
   if (avatar_) {
     avatar_->SetCornerRadii(0, kTrayRoundedBorderRadius,
                             kTrayRoundedBorderRadius, 0);
-    avatar_->SetBorder(views::Border::NullBorder());
+    const int distance_to_avatar =
+        MaterialDesignController::IsShelfMaterial()
+            ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING)
+            : 0;
+    bool is_horizontal =

[tdanderson, 2016/10/05 21:34:29]

nit: const

[yiyix, 2016/10/05 22:46:47]

Done.

+        IsHorizontalAlignment(system_tray()->shelf_alignment());
+    avatar_->SetBorder(views::Border::CreateEmptyBorder(
+        is_horizontal ? 0 : distance_to_avatar,
+        is_horizontal ? distance_to_avatar : 0, 0, 0));

[tdanderson, 2016/10/05 21:34:29]

nice use of ternary

[yiyix, 2016/10/05 22:46:47]

thanks.

   }
   UpdateAvatarImage(status);
 
   // Update layout after setting label_ and avatar_ with new login status.
   UpdateLayoutOfItem();
 }
 
 void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   // Inactive users won't have a layout.
   if (!layout_view_)
     return;
+  const int distance_to_avatar = MaterialDesignController::IsShelfMaterial()
+                                     ? GetTrayConstant(TRAY_IMAGE_ITEM_PADDING)
+                                     : 0;
   if (IsHorizontalAlignment(alignment)) {
     if (avatar_) {
-      avatar_->SetBorder(views::Border::NullBorder());
+      avatar_->SetBorder(
+          views::Border::CreateEmptyBorder(0, distance_to_avatar, 0, 0));
       avatar_->SetCornerRadii(0, kTrayRoundedBorderRadius,
                               kTrayRoundedBorderRadius, 0);
     }
     if (label_) {
       // If label_ hasn't figured out its size yet, do that first.
       if (label_->GetContentsBounds().height() == 0)
         label_->SizeToPreferredSize();
       int height = label_->GetContentsBounds().height();
       int vertical_pad = (kTrayItemSize - height) / 2;
       int remainder = height % 2;
       label_->SetBorder(views::Border::CreateEmptyBorder(
           vertical_pad + remainder,
           kTrayLabelItemHorizontalPaddingBottomAlignment, vertical_pad,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, kUserLabelToIconPadding));
   } else {
     if (avatar_) {
-      avatar_->SetBorder(views::Border::NullBorder());
+      avatar_->SetBorder(
+          views::Border::CreateEmptyBorder(distance_to_avatar, 0, 0, 0));
       avatar_->SetCornerRadii(0, 0, kTrayRoundedBorderRadius,
                               kTrayRoundedBorderRadius);
     }
     if (label_) {
       label_->SetBorder(views::Border::CreateEmptyBorder(
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
@@ skipping 38 matching lines @@
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash