Fix shelf layout when switching from left-aligned shelf to right-aligned shelf

ash/common/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/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 
 #include <algorithm>
 
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 37 matching lines @@
   if (WmShell::HasInstance())
     WmShell::Get()->keyboard_ui()->AddObserver(this);
 }
 
 VirtualKeyboardTray::~VirtualKeyboardTray() {
   // The Shell may not exist in some unit tests.
   if (WmShell::HasInstance())
     WmShell::Get()->keyboard_ui()->RemoveObserver(this);
 }
 
-void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
-  TrayBackgroundView::SetShelfAlignment(alignment);
+void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment,
+                                            const gfx::Insets& insets) {
+  TrayBackgroundView::SetShelfAlignment(alignment, insets);
   tray_container()->SetBorder(views::Border::NullBorder());
 
   // Pad button size to align with other controls in the system tray.
   const gfx::ImageSkia image =
       button_->GetImage(views::CustomButton::STATE_NORMAL);
   const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
   const int vertical_padding = (size - image.height()) / 2;
   int horizontal_padding = (size - image.width()) / 2;
   if (!ash::MaterialDesignController::IsShelfMaterial() &&
       IsHorizontalAlignment(alignment)) {
@@ skipping 26 matching lines @@
                                         const ui::Event& event) {
   DCHECK_EQ(button_, sender);
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) {
   SetVisible(WmShell::Get()->keyboard_ui()->IsEnabled());
 }
 
 }  // namespace ash