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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/date/date_default_view.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks 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
« ash/ash.gyp ('K') | « ash/system/date/date_default_view.h ('k') | ash/system/date/tray_date.h » ('j') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/date_default_view.cc
diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc
index 35b4d3659beff08bff211096045bb839dd454d60..b7cb24dbd981069fe728516e48de703c1688c6e8 100644
--- a/ash/system/date/date_default_view.cc
+++ b/ash/system/date/date_default_view.cc
@@ -34,7 +34,7 @@ const int kPaddingVertical = 19;
namespace ash {
-DateDefaultView::DateDefaultView(ash::user::LoginStatus login)
+DateDefaultView::DateDefaultView(LoginStatus login)
: help_button_(NULL),
shutdown_button_(NULL),
lock_button_(NULL),
@@ -53,8 +53,8 @@ DateDefaultView::DateDefaultView(ash::user::LoginStatus login)
->session_state_delegate()
->IsInSecondaryLoginScreen();
- if (login == user::LOGGED_IN_LOCKED ||
- login == user::LOGGED_IN_NONE || userAddingRunning)
+ if (login == LoginStatus::LOCKED || login == LoginStatus::NOT_LOGGED_IN ||
+ userAddingRunning)
return;
date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);
@@ -75,7 +75,7 @@ DateDefaultView::DateDefaultView(ash::user::LoginStatus login)
view->AddButton(help_button_);
#if !defined(OS_WIN)
- if (login != ash::user::LOGGED_IN_LOCKED) {
+ if (login != LoginStatus::LOCKED) {
shutdown_button_ = new TrayPopupHeaderButton(
this, IDR_AURA_UBER_TRAY_SHUTDOWN, IDR_AURA_UBER_TRAY_SHUTDOWN,
IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER, IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER,
« ash/ash.gyp ('K') | « ash/system/date/date_default_view.h ('k') | ash/system/date/tray_date.h » ('j') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698