Make spacing between uber tray items consistent with UI spec.

ash/system/tray/tray_views.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 
 #include "ash/ash_export.h"
+#include "ash/wm/shelf_types.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/view.h"
 
 typedef unsigned int SkColor;
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace views {
 class Label;
 class BoxLayout;
 }
 
 namespace ash {
 namespace internal {
 
+class TrayItemView;
+
 // An image view with a specified width and height (kTrayPopupDetailsIconWidth).
 // If the specified width or height is zero, then the image size is used for
 // that dimension.
 class FixedSizedImageView : public views::ImageView {
  public:
   FixedSizedImageView(int width, int height);
   virtual ~FixedSizedImageView();
 
  private:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ skipping 206 matching lines @@
 
   views::View* content_;
   views::View* button_container_;
   views::Label* text_label_;
   DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow);
 };
 
 // Sets up a Label properly for the tray (sets color, font etc.).
 void SetupLabelForTray(views::Label* label);
 
+// TODO(jennyz): refactor these two functions to SystemTrayItem.
+// Sets the empty border of an image tray item for adjusting the space
+// around it.
+void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment);
+// Sets the empty border around a label tray item for adjusting the space
+// around it.
+void SetTrayLabelItemBorder(TrayItemView* tray_view,
+                            ShelfAlignment alignment);
+
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_