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

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: merge 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 68aaef20c08544f2321b85fa197e8219446f551d..002667b159e60fc7d418781b3097fecc9ee0c2ab 100644
--- a/ash/common/system/chromeos/session/logout_button_tray.cc
+++ b/ash/common/system/chromeos/session/logout_button_tray.cc
@@ -9,6 +9,7 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
@@ -98,8 +99,9 @@ LogoutButton::LogoutButton(views::ButtonListener* listener)
LogoutButton::~LogoutButton() {}
-LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
+LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf,
+ WmShelfObserver* wm_shelf_observer)
+ : TrayBackgroundView(wm_shelf, wm_shelf_observer),
button_(nullptr),
login_status_(LoginStatus::NOT_LOGGED_IN),
show_logout_button_in_tray_(false) {
@@ -118,7 +120,6 @@ LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
button_ = new LogoutButton(this);
}
tray_container()->AddChildView(button_);
- tray_container()->SetBorder(views::Border::NullBorder());
WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
}
@@ -128,7 +129,6 @@ LogoutButtonTray::~LogoutButtonTray() {
void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
TrayBackgroundView::SetShelfAlignment(alignment);
- tray_container()->SetBorder(views::Border::NullBorder());
}
base::string16 LogoutButtonTray::GetAccessibleNameForTray() {

Powered by Google App Engine
This is Rietveld 408576698