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

Unified Diff: chrome/browser/ui/ash/network_connect_delegate_chromeos.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
Index: chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc b/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
index 8185b8b9ca1132e2114fabefa1ce7bde95704585..d0dce2ba86e8a9523806c396cd7ed446a3be0551 100644
--- a/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/network_connect_delegate_chromeos.cc
@@ -25,15 +25,15 @@ gfx::NativeWindow GetNativeWindow() {
bool session_started = ash::Shell::GetInstance()
->session_state_delegate()
->IsActiveUserSessionStarted();
- ash::user::LoginStatus login_status =
+ ash::LoginStatus login_status =
ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
bool isUserAddingRunning = ash::Shell::GetInstance()
->session_state_delegate()
->IsInSecondaryLoginScreen();
int container_id =
- (!session_started || login_status == ash::user::LOGGED_IN_NONE ||
- login_status == ash::user::LOGGED_IN_LOCKED || isUserAddingRunning)
+ (!session_started || login_status == ash::LoginStatus::NOT_LOGGED_IN ||
+ login_status == ash::LoginStatus::LOCKED || isUserAddingRunning)
? ash::kShellWindowId_LockSystemModalContainer
: ash::kShellWindowId_SystemModalContainer;
return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),

Powered by Google App Engine
This is Rietveld 408576698