Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1453)

Unified Diff: ash/common/system/chromeos/session/logout_button_tray.cc

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {

Powered by Google App Engine
This is Rietveld 408576698