Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Index: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
index 9fd239a7e31abe1799c4d96cb94b4da595aed207..9eb190b5dd99b41ead1b042286f581f0741e2b2f 100644
--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
+++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc
@@ -4,6 +4,7 @@
 
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 
+#include "ash/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ -41,7 +42,7 @@ VirtualKeyboardButton::~VirtualKeyboardButton() {
 }
 
 gfx::Size VirtualKeyboardButton::GetPreferredSize() {
-  const int virtual_keyboard_button_height = GetShelfItemHeight();
+  const int virtual_keyboard_button_height = kShelfSize;
   gfx::Size size = ImageButton::GetPreferredSize();
   int padding = virtual_keyboard_button_height - size.height();
   size.set_height(virtual_keyboard_button_height);