| Index: ash/system/tray/tray_background_view.cc
|
| diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
|
| index 2d6298277c54b405d3f950b0e4fa61eca5496ec2..f331a4fc263a9590a851eec2235bb36c4dcc2a6b 100644
|
| --- a/ash/system/tray/tray_background_view.cc
|
| +++ b/ash/system/tray/tray_background_view.cc
|
| @@ -137,8 +137,6 @@ TrayBackgroundView::TrayBackgroundView(
|
| hover_background_animator_.SetPaintsBackground(false,
|
| internal::BackgroundAnimator::CHANGE_IMMEDIATE);
|
|
|
| - SetBorder();
|
| -
|
| tray_container_ = new TrayContainer(shelf_alignment_);
|
| SetContents(tray_container_);
|
| }
|
| @@ -188,28 +186,8 @@ void TrayBackgroundView::SetPaintsBackground(
|
|
|
| void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
|
| shelf_alignment_ = alignment;
|
| - SetBorder();
|
| tray_container_->SetAlignment(alignment);
|
| }
|
|
|
| -void TrayBackgroundView::SetBorder() {
|
| - // Change the border padding for different shelf alignment.
|
| - if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
|
| - set_border(views::Border::CreateEmptyBorder(0, 0,
|
| - kPaddingFromBottomOfScreenBottomAlignment,
|
| - kPaddingFromRightEdgeOfScreenBottomAlignment));
|
| - } else if (shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
|
| - set_border(views::Border::CreateEmptyBorder(0,
|
| - kPaddingFromOuterEdgeOfLauncherVerticalAlignment,
|
| - kPaddingFromBottomOfScreenVerticalAlignment,
|
| - kPaddingFromInnerEdgeOfLauncherVerticalAlignment));
|
| - } else {
|
| - set_border(views::Border::CreateEmptyBorder(0,
|
| - kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
|
| - kPaddingFromBottomOfScreenVerticalAlignment,
|
| - kPaddingFromOuterEdgeOfLauncherVerticalAlignment));
|
| - }
|
| -}
|
| -
|
| } // namespace internal
|
| } // namespace ash
|
|
|