Make spacing between uber tray items consistent with UI spec.

ash/system/network/tray_network.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/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 126 matching lines @@
   const ErrorMap& messages() const { return messages_; }
 
  private:
   ErrorMap messages_;
 };
 
 class NetworkTrayView : public TrayItemView {
  public:
   NetworkTrayView(ColorTheme size, bool tray_icon)
       : color_theme_(size), tray_icon_(tray_icon) {
-    SetLayoutManager(new views::FillLayout());
+    SetLayoutManager(
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
     image_view_ = color_theme_ == DARK ?
         new FixedSizedImageView(0, kTrayPopupItemHeight) :
         new views::ImageView;
     AddChildView(image_view_);
 
     NetworkIconInfo info;
     Shell::GetInstance()->tray_delegate()->
         GetMostRelevantNetworkIcon(&info, false);
     Update(info);
@@ skipping 555 matching lines @@
       notification_(NULL),
       errors_(new tray::NetworkErrors()) {
 }
 
 TrayNetwork::~TrayNetwork() {
 }
 
 views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_ == NULL);
   tray_ = new tray::NetworkTrayView(tray::LIGHT, true /*tray_icon*/);
+  UpdateAfterShelfAlignmentChange(
+      ash::Shell::GetInstance()->system_tray()->shelf_alignment());
   return tray_;
 }
 
 views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ = new tray::NetworkDefaultView(this);
   return default_;
 }
 
 views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
@@ skipping 22 matching lines @@
   detailed_ = NULL;
 }
 
 void TrayNetwork::DestroyNotificationView() {
   notification_ = NULL;
 }
 
 void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
+void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
+  SetTrayImageItemBorder(tray_, alignment);
+}
+
 void TrayNetwork::OnNetworkRefresh(const NetworkIconInfo& info) {
   if (tray_)
     tray_->Update(info);
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 void TrayNetwork::SetNetworkError(NetworkTrayDelegate* delegate,
@@ skipping 24 matching lines @@
 
 void TrayNetwork::LinkClicked(ErrorType error_type) {
   tray::NetworkErrors::ErrorMap::const_iterator iter =
       errors()->messages().find(error_type);
   if (iter != errors()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked();
 }
 
 }  // namespace internal
 }  // namespace ash