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

ash/common/system/chromeos/session/logout_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/common/system/chromeos/session/logout_button_tray.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/shelf_types.h"
@@ skipping 90 matching lines @@
   button_ = new LogoutButton(this);
   tray_container()->AddChildView(button_);
   tray_container()->SetBorder(views::Border::NullBorder());
   WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
   WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this);
 }
 
-void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
-  TrayBackgroundView::SetShelfAlignment(alignment);
+void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment,
+                                         const gfx::Insets& insets) {
+  TrayBackgroundView::SetShelfAlignment(alignment, insets);
   tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
 
@@ skipping 29 matching lines @@
   UpdateVisibility();
 }
 
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != LoginStatus::NOT_LOGGED_IN &&
              login_status_ != LoginStatus::LOCKED);
 }
 
 }  // namespace ash