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();

[sadrul, 2014/07/31 21:18:52]

Shelf* shelf = ...

[kevers, 2014/08/01 15:21:40]

Done.

+  bool isHorizontal = shelf && (shelf->alignment() == SHELF_ALIGNMENT_BOTTOM ||

[sadrul, 2014/07/31 21:18:52]

is_horizontal

[kevers, 2014/08/01 15:21:40]

Done.

+      shelf->alignment() == SHELF_ALIGNMENT_TOP);
+  int padding = isHorizontal ? virtual_keyboard_button_height - size.height() :
+      0;
   size.set_height(virtual_keyboard_button_height);
   size.set_width(size.width() + padding);

[sadrul, 2014/07/31 21:18:52]

Why do we add this padding?

[kevers, 2014/08/01 15:21:40]

The a11y button is detached form the remaining controls on the right hand side
(horizontally aligned) or bottom (vertically aligned) of the shelf. It is a
separate control for displaying the virtual keyboard in locked mode independent
of input focus, providing the ability to type hot-key combinations. The padding
is for aesthetics to look consistent with other controls.  When vertically
aligned, the padding causes the button to be too wide for the shelf.

   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,
@@ skipping 48 matching lines @@
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnAccessibilityModeChanged(
     AccessibilityNotificationVisibility notify) {
   SetVisible(Shell::GetInstance()->accessibility_delegate()->
       IsVirtualKeyboardEnabled());
 }
 
 }  // namespace ash