| Index: ash/common/system/chromeos/session/logout_button_tray.cc
|
| diff --git a/ash/common/system/chromeos/session/logout_button_tray.cc b/ash/common/system/chromeos/session/logout_button_tray.cc
|
| index 08cdfba6ac8e8e8378924a9fa14fb706a065f289..785b9056879b141bc99e0d9735b1b2bbe5eaae18 100644
|
| --- a/ash/common/system/chromeos/session/logout_button_tray.cc
|
| +++ b/ash/common/system/chromeos/session/logout_button_tray.cc
|
| @@ -119,7 +119,8 @@ LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
|
| button_ = new LogoutButton(this);
|
| }
|
| tray_container()->AddChildView(button_);
|
| - tray_container()->SetBorder(views::Border::NullBorder());
|
| + if (!ash::MaterialDesignController::IsShelfMaterial())
|
| + tray_container()->SetBorder(views::Border::NullBorder());
|
| WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
|
| }
|
|
|
| @@ -132,7 +133,8 @@ void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
|
| // TrayBackgroundView::SetShelfAlignment() can lay it out correctly.
|
| UpdateButtonTextAndImage(login_status_, alignment);
|
| TrayBackgroundView::SetShelfAlignment(alignment);
|
| - tray_container()->SetBorder(views::Border::NullBorder());
|
| + if (!ash::MaterialDesignController::IsShelfMaterial())
|
| + tray_container()->SetBorder(views::Border::NullBorder());
|
| }
|
|
|
| base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
|
|
|