Make spacing between uber tray items consistent with UI spec.

ash/system/tray/tray_item_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_item_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm/shelf_types.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/layout/fill_layout.h"
+#include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kTrayIconHeight = 29;
 const int kTrayIconWidth = 29;
 const int kTrayItemAnimationDurationMS = 200;
 }
 
 namespace ash {
 namespace internal {
 
 TrayItemView::TrayItemView()
     : label_(NULL),
       image_view_(NULL) {
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
-  SetLayoutManager(new views::FillLayout);
+  SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 }
 
 TrayItemView::~TrayItemView() {}
 
 void TrayItemView::CreateLabel() {
   label_ = new views::Label;
   AddChildView(label_);
 }
 
 void TrayItemView::CreateImageView() {
@@ skipping 64 matching lines @@
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
   AnimationEnded(animation);
 }
 
 }  // namespace internal
 }  // namespace ash