Fix padding of a11y keyboard indicator when shelf is vertically aligned.

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.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"
@@ skipping 20 matching lines @@
 VirtualKeyboardButton::VirtualKeyboardButton(views::ButtonListener* listener)
     : views::ImageButton(listener) {
 }
 
 VirtualKeyboardButton::~VirtualKeyboardButton() {
 }
 
 gfx::Size VirtualKeyboardButton::GetPreferredSize() const {
   const int virtual_keyboard_button_height = kShelfSize;
   gfx::Size size = ImageButton::GetPreferredSize();
-  int padding = virtual_keyboard_button_height - size.height();
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  bool is_horizontal = shelf && (shelf->alignment() == SHELF_ALIGNMENT_BOTTOM ||
+      shelf->alignment() == SHELF_ALIGNMENT_TOP);
+  int padding = is_horizontal ? virtual_keyboard_button_height - size.height() :
+      0;
   size.set_height(virtual_keyboard_button_height);
   size.set_width(size.width() + padding);
   return size;
 }
 
 }  // namespace
 
 VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget),
       button_(NULL) {
   button_ = new VirtualKeyboardButton(this);
   button_->SetImage(views::CustomButton::STATE_NORMAL,
                     ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                         IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD));
   button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                              views::ImageButton::ALIGN_MIDDLE);

[sadrul, 2014/08/01 15:29:17]

As discussed offline: you should be able to do:

  button_ = new views::ImageButton(this);
  button_->SetBorder(views::Border::CreateEmptyBorder(<top>, <left> ...));
  button_->SetImage(....);
  ...

And remove the VirtualKeyboardButton class.

You would also want to SetBorder with the updated paddings in SetShelfAlignment
below.

[kevers, 2014/08/01 18:44:00]

Done.

 
   tray_container()->AddChildView(button_);
   SetContentsBackground();
   // The Shell may not exist in some unit tests.
   if (Shell::HasInstance()) {
     Shell::GetInstance()->system_tray_notifier()->
         AddAccessibilityObserver(this);
   }
 }
 
@@ skipping 34 matching lines @@
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   SetVisible(Shell::GetInstance()->accessibility_delegate()->
       IsVirtualKeyboardEnabled());
 }
 
 }  // namespace ash