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

ash/common/system/tray/tray_background_view.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/common/system/tray/tray_background_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 233 matching lines @@
   // Start the tray items not visible, because visibility changes are animated.
   views::View::SetVisible(false);
 }
 
 TrayBackgroundView::~TrayBackgroundView() {
   if (GetWidget())
     GetWidget()->RemoveObserver(widget_observer_.get());
   StopObservingImplicitAnimations();
 }
 
-void TrayBackgroundView::Initialize() {
+void TrayBackgroundView::Initialize(const gfx::Insets& insets) {
   GetWidget()->AddObserver(widget_observer_.get());
+  SetTrayBorder(insets);
 }
 
 // static
 void TrayBackgroundView::InitializeBubbleAnimations(
     views::Widget* bubble_widget) {
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(bubble_widget);
   window->SetVisibilityAnimationType(
       ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
   window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
   window->SetVisibilityAnimationDuration(
@@ skipping 102 matching lines @@
 
 void TrayBackgroundView::SetContents(views::View* contents) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(contents);
 }
 void TrayBackgroundView::SetContentsBackground() {
   background_ = new TrayBackground(this);
   tray_container_->set_background(background_);
 }
 
-void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
+void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment,
+                                           const gfx::Insets& insets) {
   shelf_alignment_ = alignment;
+  SetTrayBorder(insets);

[James Cook, 2016/06/29 19:34:14]

This should pull the insets from somewhere, rather than having them pushed in.

   tray_container_->SetAlignment(alignment);
 }
 
+void TrayBackgroundView::SetTrayBorder(const gfx::Insets& insets) {
+  SetBorder(views::Border::CreateEmptyBorder(insets.top(), insets.left(),
+                                             insets.bottom(), insets.right()));
+}
+
 void TrayBackgroundView::OnImplicitAnimationsCompleted() {
   // If there is another animation in the queue, the reverse animation was
   // triggered before the completion of animating to invisible. Do not turn off
   // the visibility so that the next animation may render. The value of
   // layer()->GetTargetVisibility() can be incorrect if the hide animation was
   // aborted to schedule an animation to become visible. As the new animation
   // is not yet added to the queue. crbug.com/374236
   if (layer()->GetAnimator()->is_animating() || layer()->GetTargetVisibility())
     return;
   views::View::SetVisible(false);
@@ skipping 111 matching lines @@
     return;
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
 }  // namespace ash