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

Unified Diff: ash/system/tray/system_tray_bubble.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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
« no previous file with comments | « ash/system/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_bubble.cc
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index b025484946d602afe536c15c2fb59a218fa3b99c..fdd963949464389c328ddbd0ef26f7f729ca3d58 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -181,7 +181,7 @@ void SystemTrayBubble::UpdateView(
}
void SystemTrayBubble::InitView(views::View* anchor,
- user::LoginStatus login_status,
+ LoginStatus login_status,
TrayBubbleView::InitParams* init_params) {
DCHECK(bubble_view_ == NULL);
@@ -281,13 +281,13 @@ bool SystemTrayBubble::ShouldShowShelf() const {
return false;
}
-void SystemTrayBubble::CreateItemViews(user::LoginStatus login_status) {
+void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
std::vector<views::View*> item_views;
// If a system modal dialog is present, create the same tray as
// in locked state.
if (Shell::GetInstance()->IsSystemModalWindowOpen() &&
- login_status != user::LOGGED_IN_NONE) {
- login_status = user::LOGGED_IN_LOCKED;
+ login_status != LoginStatus::NOT_LOGGED_IN) {
+ login_status = LoginStatus::LOCKED;
}
views::View* focus_view = NULL;
« no previous file with comments | « ash/system/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698