Give Ash material design tray items the correct size and layout

ash/system/chromeos/virtual_keyboard/virtual_keyboard_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/virtual_keyboard/virtual_keyboard_tray.h"
 
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 42 matching lines @@
     Shell::GetInstance()->keyboard_ui()->RemoveObserver(this);
 }
 
 void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
 
   // Pad button size to align with other controls in the system tray.
   const gfx::ImageSkia image =
       button_->GetImage(views::CustomButton::STATE_NORMAL);
-  int top_padding = (kTrayBarButtonWidth - image.height()) / 2;
-  int left_padding = (kTrayBarButtonWidth - image.width()) / 2;
-  int bottom_padding = kTrayBarButtonWidth - image.height() - top_padding;
-  int right_padding = kTrayBarButtonWidth - image.width() - left_padding;
-
-  // Square up the padding if horizontally aligned. Avoid extra padding when
-  // vertically aligned as the button would violate the width constraint on the
-  // shelf.
-  if (IsHorizontalAlignment(alignment)) {
-    int additional_padding = std::max(0, top_padding - left_padding);
-    left_padding += additional_padding;
-    right_padding += additional_padding;
+  const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
+  const int vertical_padding = (size - image.height()) / 2;
+  int horizontal_padding = (size - image.width()) / 2;
+  if (!ash::MaterialDesignController::IsShelfMaterial() &&
+      IsHorizontalAlignment(alignment)) {
+    // Square up the padding if horizontally aligned. Avoid extra padding when
+    // vertically aligned as the button would violate the width constraint on
+    // the shelf.
+    horizontal_padding += std::max(0, vertical_padding - horizontal_padding);
   }
 
   button_->SetBorder(views::Border::CreateEmptyBorder(
-      top_padding, left_padding, bottom_padding, right_padding));
+      gfx::Insets(vertical_padding, horizontal_padding)));
 }
 
 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME);
 }
 
 void VirtualKeyboardTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
 
 void VirtualKeyboardTray::ClickedOutsideBubble() {}
 
 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) {
   Shell::GetInstance()->keyboard_ui()->Show();
   return true;
 }
 
 void VirtualKeyboardTray::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   DCHECK_EQ(button_, sender);
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) {
   SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled());
 }
 
 }  // namespace ash