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

ash/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 240 matching lines @@
   void set_alpha(int alpha) { alpha_ = alpha; }
 
  private:
   // Overridden from views::Background.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
     SkPaint paint;
     paint.setAntiAlias(true);
     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);
   }
 
   int alpha_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBackground);
 };
 
@@ skipping 132 matching lines @@
       update_observer_(NULL),
       user_observer_(NULL),
       bubble_(NULL),
       popup_(NULL),
       mouse_in_tray_(false),
       background_(new internal::SystemTrayBackground),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           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);
   set_focusable(true);
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(container_);
 
   // Initially we want to paint the background.
   SetPaintsBackground(true, internal::BackgroundAnimator::CHANGE_IMMEDIATE);
 }
@@ skipping 150 matching lines @@
 }
 
 void SystemTray::UpdateBackground(int alpha) {
   if (mouse_in_tray_)
     alpha += kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha;
   background_->set_alpha(alpha);
   SchedulePaint();
 }
 
 }  // namespace ash