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

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: new approach Created 4 years, 5 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 ca18e32095f42947eb924ba59d348144e19d6869..106d678070144ee754a9e8f5618af1fd503eb7c4 100644
--- a/ash/common/system/chromeos/session/logout_button_tray.cc
+++ b/ash/common/system/chromeos/session/logout_button_tray.cc
@@ -14,6 +14,7 @@
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_utils.h"
#include "ash/common/system/user/login_status.h"
+#include "ash/common/system/view_observer.h"
#include "ash/common/wm_shell.h"
#include "base/logging.h"
#include "grit/ash_resources.h"
@@ -93,14 +94,14 @@ LogoutButton::LogoutButton(views::ButtonListener* listener)
LogoutButton::~LogoutButton() {}
-LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
+LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf,
+ ViewObserver* view_observer)
+ : TrayBackgroundView(wm_shelf, view_observer),
button_(NULL),
login_status_(LoginStatus::NOT_LOGGED_IN),
show_logout_button_in_tray_(false) {
button_ = new LogoutButton(this);
tray_container()->AddChildView(button_);
- tray_container()->SetBorder(views::Border::NullBorder());
WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
}
@@ -110,7 +111,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