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

ash/common/system/tray/tray_background_view.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/wm/background_animator.h"
 #include "base/macros.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
+namespace gfx {
+class Insets;
+}
+
 namespace ash {
 class ShelfLayoutManager;
 class TrayEventFilter;
 class TrayBackground;
 class WmShelf;
 
 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray,
 // LogoutButtonTray, OverviewButtonTray.
 // This class handles setting and animating the background when the Launcher
 // his shown/hidden. It also inherits from ActionableView so that the tray
@@ skipping 30 matching lines @@
 
     ShelfAlignment alignment_;
     gfx::Size size_;
 
     DISALLOW_COPY_AND_ASSIGN(TrayContainer);
   };
 
   explicit TrayBackgroundView(WmShelf* wm_shelf);
   ~TrayBackgroundView() override;
 
-  // Called after the tray has been added to the widget containing it.
-  virtual void Initialize();
+  // Called after the tray has been added to the widget containing it. Set the
+  // tray items with border specified in |insets|.
+  virtual void Initialize(const gfx::Insets& insets);
 
   // Initializes animations for the bubble.
   static void InitializeBubbleAnimations(views::Widget* bubble_widget);
 
   // views::View:
   void SetVisible(bool visible) override;
   const char* GetClassName() const override;
   void ChildPreferredSizeChanged(views::View* child) override;
   void GetAccessibleState(ui::AXViewState* state) override;
   void AboutToRequestFocusFromTabTraversal(bool reverse) override;
 
   // ActionableView:
   bool PerformAction(const ui::Event& event) override;
   gfx::Rect GetFocusBounds() override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // BackgroundAnimatorDelegate:
   void UpdateBackground(int alpha) override;
 
-  // Called whenever the shelf alignment changes.
-  virtual void SetShelfAlignment(ShelfAlignment alignment);
+  // Called whenever the shelf alignment changes and set the tray items with the
+  // new border based on alignment specified in |insets|.
+  virtual void SetShelfAlignment(ShelfAlignment alignment,
+                                 const gfx::Insets& insets);
 
   // Called when the anchor (tray or bubble) may have moved or changed.
   virtual void AnchorUpdated() {}
 
   // Called from GetAccessibleState, must return a valid accessible name.
   virtual base::string16 GetAccessibleNameForTray() = 0;
 
   // Called when the bubble is resized.
   virtual void BubbleResized(const views::TrayBubbleView* bubble_view) {}
 
@@ skipping 31 matching lines @@
   TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
   WmShelf* shelf() { return wm_shelf_; }
 
   // Updates the arrow visibility based on the launcher visibility.
   void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
 
  private:
   class TrayWidgetObserver;
 
   // Called from Initialize after all status area trays have been created.
-  // Sets the border based on the position of the view.
-  void SetTrayBorder();
+  // Sets the border based on given |insets|.
+  void SetTrayBorder(const gfx::Insets& insets);
 
   // ui::ImplicitAnimationObserver:
   void OnImplicitAnimationsCompleted() override;
   bool RequiresNotificationWhenAnimatorDestroyed() const override;
 
   // Applies transformations to the |layer()| to animate the view when
   // SetVisible(false) is called.
   void HideTransformation();
 
   // The shelf containing the system tray for this view.
@@ skipping 15 matching lines @@
 
   std::unique_ptr<TrayWidgetObserver> widget_observer_;
   std::unique_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_