Give Ash material design tray items the correct size and layout

ash/system/chromeos/session/logout_button_tray.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/chromeos/session/logout_button_tray.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/shelf_types.h"
@@ skipping 71 matching lines @@
   border->SetPainter(
       false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(kLogoutButtonPushedImages));
   gfx::Insets insets = border->GetInsets();
   insets += gfx::Insets(0, kLogoutButtonHorizontalExtraPadding, 0,
                         kLogoutButtonHorizontalExtraPadding);
   border->set_insets(insets);
   SetBorder(std::move(border));
   set_animate_on_state_change(false);
 
-  SetMinSize(gfx::Size(0, kShelfItemHeight));
+  SetMinSize(gfx::Size(0, GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY)));
 }
 
 LogoutButton::~LogoutButton() {}
 
 LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
       button_(NULL),
       login_status_(LoginStatus::NOT_LOGGED_IN),
       show_logout_button_in_tray_(false) {
   button_ = new LogoutButton(this);
@@ skipping 50 matching lines @@
   UpdateVisibility();
 }
 
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != LoginStatus::NOT_LOGGED_IN &&
              login_status_ != LoginStatus::LOCKED);
 }
 
 }  // namespace ash