ash: Status Tray User Icon Update

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 944e8bb1fb382c2cc401f9640e7de94d529a6fd6..61095d7027880fd376031537c8b01650f06a4f17 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -279,14 +279,14 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
     int vertical_padding = kTrayContainerVerticalPaddingBottomAlignment;
     int horizontal_padding = kTrayContainerHorizontalPaddingBottomAlignment;
     if (ash::switches::UseAlternateShelfLayout()) {
-      vertical_padding += kPaddingFromEdgeOfShelf;
-      horizontal_padding += kPaddingFromEdgeOfShelf;
+      vertical_padding = kPaddingFromEdgeOfShelf;
+      horizontal_padding = kPaddingFromEdgeOfShelf;
     }
     set_border(views::Border::CreateEmptyBorder(
-          vertical_padding,
-          horizontal_padding,
-          horizontal_padding,
-          vertical_padding));
+        vertical_padding,
+        horizontal_padding,
+        horizontal_padding,
+        vertical_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
@@ -296,8 +296,8 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
     int vertical_padding = kTrayContainerVerticalPaddingVerticalAlignment;
     int horizontal_padding = kTrayContainerHorizontalPaddingVerticalAlignment;
     if (ash::switches::UseAlternateShelfLayout()) {
-      vertical_padding += kPaddingFromEdgeOfShelf;
-      horizontal_padding += kPaddingFromEdgeOfShelf;
+      vertical_padding = kPaddingFromEdgeOfShelf;
+      horizontal_padding = kPaddingFromEdgeOfShelf;
     }
     set_border(views::Border::CreateEmptyBorder(
         vertical_padding,