Fix status area tray spacing.

ash/system/status_area_widget.cc

Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index ca2a88ddb69109e318ee7b680e04896c348bec2b..6638d1f316bc83135dd22e81e1b09db8217c9d96 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -276,20 +276,20 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
 namespace internal {
 
 StatusAreaWidget::StatusAreaWidget()
-    : widget_delegate_(new internal::StatusAreaWidgetDelegate),
+    : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
       system_tray_(NULL),
       web_notification_tray_(NULL),
       login_status_(user::LOGGED_IN_NONE) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  params.delegate = widget_delegate_;
+  params.delegate = status_area_widget_delegate_;
   params.parent =
       Shell::GetPrimaryRootWindowController()->GetContainer(
           ash::internal::kShellWindowId_StatusContainer);
   params.transparent = true;
   Init(params);
   set_focus_on_creation(false);
-  SetContentsView(widget_delegate_);
+  SetContentsView(status_area_widget_delegate_);
   GetNativeView()->SetName("StatusAreaWidget");
 }
 
@@ -315,7 +315,7 @@ void StatusAreaWidget::Shutdown() {
 void StatusAreaWidget::AddSystemTray(SystemTray* system_tray,
                                      ShellDelegate* shell_delegate) {
   system_tray_ = system_tray;
-  widget_delegate_->AddTray(system_tray);
+  status_area_widget_delegate_->AddTray(system_tray);
   system_tray_->Initialize();  // Called after added to widget.
 
   if (shell_delegate) {
@@ -332,16 +332,16 @@ void StatusAreaWidget::AddSystemTray(SystemTray* system_tray,
 void StatusAreaWidget::AddWebNotificationTray(
     WebNotificationTray* web_notification_tray) {
   web_notification_tray_ = web_notification_tray;
-  widget_delegate_->AddTray(web_notification_tray);
+  status_area_widget_delegate_->AddTray(web_notification_tray);
 }
 
 void StatusAreaWidget::SetShelfAlignment(ShelfAlignment alignment) {
-  widget_delegate_->set_alignment(alignment);
+  status_area_widget_delegate_->set_alignment(alignment);
   if (system_tray_)
     system_tray_->SetShelfAlignment(alignment);
   if (web_notification_tray_)
     web_notification_tray_->SetShelfAlignment(alignment);
-  widget_delegate_->UpdateLayout();
+  status_area_widget_delegate_->UpdateLayout();
 }
 
 void StatusAreaWidget::SetPaintsBackground(