Adjust uber tray spacing around avatar and draw avatar using rounded rectangle.

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 7e442153a5b1912ef2db8543bc8d8c5717e21665..2a93fafeecb49847a243dd537a22caebd65a2cf9 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -258,7 +258,7 @@ class SystemTrayBackground : public views::Background {
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SkColorSetARGB(alpha_, 0, 0, 0));
     SkPath path;
-    gfx::Rect bounds(view->GetContentsBounds());
+    gfx::Rect bounds(view->bounds());
     SkScalar radius = SkIntToScalar(4);
     path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
     canvas->sk_canvas()->drawPath(path, paint);
@@ -411,8 +411,10 @@ SystemTray::SystemTray()
           background_animator_(this, 0, kTrayBackgroundAlpha)) {
   container_ = new views::View;
   container_->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 5, 0, kTrayPaddingBetweenItems));
+      views::BoxLayout::kHorizontal, 0, 0, kTrayPaddingBetweenItems));
   container_->set_background(background_);
+  container_->set_border(
+      views::Border::CreateEmptyBorder(1, kTrayPaddingBetweenItems, 1, 1));
   set_border(views::Border::CreateEmptyBorder(0, 0,
         kPaddingFromBottomOfScreen, kPaddingFromRightEdgeOfScreen));
   set_notify_enter_exit_on_child(true);