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

ash/system/tray/system_tray.cc

 // Copyright (c) 2012 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/tray/system_tray.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 131 matching lines @@
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
   system_bubble_.reset();
   notification_bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end(); ++it) {
     (*it)->DestroyTrayView();
   }
 }
 
-void SystemTray::InitializeTrayItems(
-    SystemTrayDelegate* delegate,
-    WebNotificationTray* web_notification_tray) {
+void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate,
+                                     WebNotificationTray* web_notification_tray,
+                                     const gfx::Insets& insets) {
   DCHECK(web_notification_tray);
   web_notification_tray_ = web_notification_tray;
-  TrayBackgroundView::Initialize();
+  TrayBackgroundView::Initialize(insets);
   CreateItems(delegate);
 }
 
 void SystemTray::Shutdown() {
   DCHECK(web_notification_tray_);
   web_notification_tray_ = nullptr;
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   WmShell* wm_shell = WmShell::Get();
@@ skipping 425 matching lines @@
 }
 
 base::string16 SystemTray::GetAccessibleTimeString(
     const base::Time& now) const {
   base::HourClockType hour_type =
       WmShell::Get()->system_tray_delegate()->GetHourClockType();
   return base::TimeFormatTimeOfDayWithHourClockType(now, hour_type,
                                                     base::kKeepAmPm);
 }
 
-void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
+void SystemTray::SetShelfAlignment(ShelfAlignment alignment,
+                                   const gfx::Insets& insets) {
   if (alignment == shelf_alignment())
     return;
-  TrayBackgroundView::SetShelfAlignment(alignment);
+  TrayBackgroundView::SetShelfAlignment(alignment, insets);
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   CloseSystemBubbleAndDeactivateSystemTray();
   // Rebuild any notification bubble.
   if (notification_bubble_) {
     notification_bubble_.reset();
     UpdateNotificationBubble();
     // UpdateWebNotifications() should be called in UpdateNotificationBubble().
   } else if (!hide_notifications_) {
     UpdateWebNotifications();
@@ skipping 146 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash