Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
index 7f986609432d360c519d551ba5a5790c9d635c59..3c260d5516c62df2ee4d8e7e917d78351b7b5aea 100644 |
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
@@ -137,9 +137,13 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, |
gfx::NativeWindow GetNativeWindowByStatus(ash::user::LoginStatus login_status, |
bool session_started) { |
+ 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) |
+ login_status == ash::user::LOGGED_IN_LOCKED || isUserAddingRunning) |
? ash::kShellWindowId_LockSystemModalContainer |
: ash::kShellWindowId_SystemModalContainer; |
return ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |