Make spacing between uber tray items consistent with UI spec.

ash/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/system/user/tray_user.h"
 
 #include "ash/shell.h"
+#include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 const int kUserInfoVerticalPadding = 10;
-const int kUserInfoEmptyBorderLeftPadding = 6;
-const int kUserInfoEmptyBorderRightPadding = 1;
 const int kUserIconSize = 27;
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 // A custom image view with rounded edges.
@@ skipping 203 matching lines @@
     : user_(NULL),
       avatar_(NULL) {
 }
 
 TrayUser::~TrayUser() {
 }
 
 views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
   CHECK(avatar_ == NULL);
   avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius);
-  avatar_->set_border(views::Border::CreateEmptyBorder(
-      0, kUserInfoEmptyBorderLeftPadding, 0, kUserInfoEmptyBorderRightPadding));
+  UpdateAfterShelfAlignmentChange(
+      ash::Shell::GetInstance()->system_tray()->shelf_alignment());
   UpdateAfterLoginStatusChange(status);
   return avatar_;
 }
 
 views::View* TrayUser::CreateDefaultView(user::LoginStatus status) {
   if (status == user::LOGGED_IN_NONE)
     return NULL;
 
   CHECK(user_ == NULL);
   user_ = new tray::UserView(status);
@@ skipping 20 matching lines @@
       status != user::LOGGED_IN_GUEST) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
         gfx::Size(kUserIconSize, kUserIconSize));
     avatar_->SetVisible(true);
   } else {
     avatar_->SetVisible(false);
   }
 }
 
+void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+  SetTrayImageItemBorder(avatar_, alignment);
+}
+
 void TrayUser::OnUserUpdate() {
   avatar_->SetImage(
       ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
       gfx::Size(kUserIconSize, kUserIconSize));
 }
 
 }  // namespace internal
 }  // namespace ash