| Index: ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| diff --git a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| index 205af0425d2cad495d9095c1144ea94d2d697fff..417a63b7b75e673ca5aa1a6d0d02ce3272eefc79 100644
|
| --- a/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| +++ b/ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
|
| @@ -100,8 +100,8 @@ void VirtualKeyboardTray::OnKeyboardBoundsChanging(
|
| void VirtualKeyboardTray::SetIconBorderForShelfAlignment() {
|
| // Every time shelf alignment is updated, StatusAreaWidgetDelegate resets the
|
| // border to a non-null border. So, we need to remove it.
|
| - tray_container()->SetBorder(views::Border::NullBorder());
|
| -
|
| + if (!ash::MaterialDesignController::IsShelfMaterial())
|
| + tray_container()->SetBorder(views::Border::NullBorder());
|
| const gfx::ImageSkia& image = icon_->GetImage();
|
| const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
|
| const int vertical_padding = (size - image.height()) / 2;
|
|
|