Shelf Cleanup AlternateShelfLayout P1 Attempt 3

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/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
@@ skipping 17 matching lines @@
 };
 
 VirtualKeyboardButton::VirtualKeyboardButton(views::ButtonListener* listener)
     : views::ImageButton(listener) {
 }
 
 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);
   size.set_width(size.width() + padding);
   return size;
 }
 
 }  // namespace
 
 VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)
@@ skipping 53 matching lines @@
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   SetVisible(Shell::GetInstance()->accessibility_delegate()->
       IsVirtualKeyboardEnabled());
 }
 
 }  // namespace ash