| Index: ash/common/system/tray/tray_background_view.cc
|
| diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
|
| index 3e26c5069993d2872ef9ae0d0f4602002b223bb3..4ed67b01e4c7c3d7bd0fb0d376148f6c39339852 100644
|
| --- a/ash/common/system/tray/tray_background_view.cc
|
| +++ b/ash/common/system/tray/tray_background_view.cc
|
| @@ -175,6 +175,11 @@ void TrayBackgroundView::TrayContainer::SetAlignment(ShelfAlignment alignment) {
|
| UpdateLayout();
|
| }
|
|
|
| +void TrayBackgroundView::TrayContainer::SetMargin(const gfx::Insets& margin) {
|
| + margin_ = margin;
|
| + UpdateLayout();
|
| +}
|
| +
|
| gfx::Size TrayBackgroundView::TrayContainer::GetPreferredSize() const {
|
| if (size_.IsEmpty())
|
| return views::View::GetPreferredSize();
|
| @@ -207,8 +212,9 @@ void TrayBackgroundView::TrayContainer::UpdateLayout() {
|
| // Additional padding used to adjust the user-visible size of status tray
|
| // dark background.
|
| const int padding = 3;
|
| - SetBorder(
|
| - views::Border::CreateEmptyBorder(padding, padding, padding, padding));
|
| + SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(padding) + margin_));
|
| + } else {
|
| + SetBorder(views::Border::CreateEmptyBorder(margin_));
|
| }
|
|
|
| views::BoxLayout* layout = new views::BoxLayout(orientation, 0, 0, 0);
|
|
|