Give Ash material design tray items the correct size and layout

ash/system/overview/overview_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/overview/overview_button_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 86 matching lines @@
 
 void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
 
   TrayBackgroundView::SetShelfAlignment(alignment);
   SetIconBorderForShelfAlignment();
 }
 
 void OverviewButtonTray::SetIconBorderForShelfAlignment() {
-  if (IsHorizontalAlignment(shelf_alignment())) {
+  if (ash::MaterialDesignController::IsShelfMaterial()) {
+    // Pad button size to align with other controls in the system tray.
+    const gfx::ImageSkia image = icon_->GetImage();
+    const int top_padding = (kTrayItemSize - image.height()) / 2;
+    const int left_padding = (kTrayItemSize - image.width()) / 2;
+    const int bottom_padding = kTrayItemSize - image.height() - top_padding;
+    const int right_padding = kTrayItemSize - image.width() - left_padding;
+
     icon_->SetBorder(views::Border::CreateEmptyBorder(
-        kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding,
-        kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding));
+        top_padding, left_padding, bottom_padding, right_padding));
   } else {
-    icon_->SetBorder(views::Border::CreateEmptyBorder(
-        kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding,
-        kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding));
+    if (IsHorizontalAlignment(shelf_alignment())) {
+      icon_->SetBorder(views::Border::CreateEmptyBorder(
+          kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding,
+          kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding));
+    } else {
+      icon_->SetBorder(views::Border::CreateEmptyBorder(
+          kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding,
+          kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding));
+    }
   }
 }
 
 void OverviewButtonTray::UpdateIconVisibility() {
   // The visibility of the OverviewButtonTray has diverge from
   // WindowSelectorController::CanSelect. The visibility of the button should
   // not change during transient times in which CanSelect is false. Such as when
   // a modal dialog is present.
   Shell* shell = Shell::GetInstance();
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
 
   SetVisible(
       shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
       session_state_delegate->IsActiveUserSessionStarted() &&
       !session_state_delegate->IsScreenLocked() &&
       session_state_delegate->GetSessionState() ==
           SessionStateDelegate::SESSION_STATE_ACTIVE &&
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
           LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash