ash: Status Tray User Icon Update

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/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 261 matching lines @@
 }
 
 void TrayBackgroundView::TrayContainer::UpdateLayout() {
   // Adjust the size of status tray dark background by adding additional
   // empty border.
   if (alignment_ == SHELF_ALIGNMENT_BOTTOM ||
       alignment_ == SHELF_ALIGNMENT_TOP) {
     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);
     layout->set_spread_blank_space(true);
     views::View::SetLayoutManager(layout);
   } else {
     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,
         horizontal_padding,
         vertical_padding,
         horizontal_padding));
 
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
     layout->set_spread_blank_space(true);
@@ skipping 274 matching lines @@
       bubble_view->GetWidget()->GetNativeView()->GetRootWindow();
   ash::internal::ShelfLayoutManager* shelf =
       ShelfLayoutManager::ForLauncher(root_window);
   bubble_view->SetArrowPaintType(
       shelf->IsVisible() ? views::BubbleBorder::PAINT_NORMAL :
                            views::BubbleBorder::PAINT_TRANSPARENT);
 }
 
 }  // namespace internal
 }  // namespace ash