Give Ash material design tray items the correct size and layout

ash/system/user/user_view.cc

 // Copyright 2014 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/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
 #include "ash/common/system/user/button_from_view.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/multi_profile_uma.h"
@@ skipping 133 matching lines @@
 
   add_user_ = new views::View;
   add_user_->SetBorder(
       views::Border::CreateEmptyBorder(0, kTrayUserTileHoverBorderInset, 0, 0));
 
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
   // Add the [+] icon which is also the anchor for messages.
-  RoundedImageView* icon = new RoundedImageView(kTrayAvatarCornerRadius, true);
+  RoundedImageView* icon = new RoundedImageView(kTrayRoundedBorderRadius, true);
   anchor_ = icon;
   icon->SetImage(*ui::ResourceBundle::GetSharedInstance()
                       .GetImageNamed(IDR_AURA_UBER_TRAY_ADD_MULTIPROFILE_USER)
                       .ToImageSkia(),
-                 gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
+                 gfx::Size(kTrayItemSize, kTrayItemSize));
   add_user_->AddChildView(icon);
 
   // Add the command text.
   views::Label* command_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
   command_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   add_user_->AddChildView(command_label);
 }
 
 }  // namespace
@@ skipping 330 matching lines @@
   focus_manager_ = NULL;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash