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

ash/system/overview/overview_button_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/overview/overview_button_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_types.h"
@@ skipping 88 matching lines @@
 
 base::string16 OverviewButtonTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(IDS_ASH_OVERVIEW_BUTTON_ACCESSIBLE_NAME);
 }
 
 void OverviewButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
   // This class has no bubbles to hide.
 }
 
-void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
+void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment,
+                                           const gfx::Insets& insets) {
   if (alignment == shelf_alignment())
     return;
 
-  TrayBackgroundView::SetShelfAlignment(alignment);
+  TrayBackgroundView::SetShelfAlignment(alignment, insets);
   SetIconBorderForShelfAlignment();
 }
 
 void OverviewButtonTray::SetIconBorderForShelfAlignment() {
   if (ash::MaterialDesignController::IsShelfMaterial()) {
     // Pad button size to align with other controls in the system tray.
     const gfx::ImageSkia image = icon_->GetImage();
     const int vertical_padding = (kTrayItemSize - image.height()) / 2;
     const int horizontal_padding = (kTrayItemSize - image.width()) / 2;
     icon_->SetBorder(views::Border::CreateEmptyBorder(
@@ skipping 24 matching lines @@
       shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
       session_state_delegate->IsActiveUserSessionStarted() &&
       !session_state_delegate->IsScreenLocked() &&
       session_state_delegate->GetSessionState() ==
           SessionStateDelegate::SESSION_STATE_ACTIVE &&
       WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
           LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash