Index: ash/system/bluetooth/tray_bluetooth.cc |
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc |
index 6f4509f8e8224a6fd50a79537cad687fa199d11b..091f24bebd1228cb3c84e52c3478927254911de2 100644 |
--- a/ash/system/bluetooth/tray_bluetooth.cc |
+++ b/ash/system/bluetooth/tray_bluetooth.cc |
@@ -4,6 +4,7 @@ |
#include "ash/system/bluetooth/tray_bluetooth.h" |
+#include "ash/session/session_state_delegate.h" |
#include "ash/shell.h" |
#include "ash/system/tray/fixed_sized_scroll_view.h" |
#include "ash/system/tray/hover_highlight_view.h" |
@@ -301,7 +302,12 @@ class BluetoothDetailedView : public TrayDetailsView, |
// Add bluetooth device requires a browser window, hide it for non logged in |
// user. |
- if (login_ == user::LOGGED_IN_NONE || login_ == user::LOGGED_IN_LOCKED) |
+ bool userAddingRunning = ash::Shell::GetInstance() |
+ ->session_state_delegate() |
+ ->IsInSecondaryLoginScreen(); |
+ |
+ if (login_ == user::LOGGED_IN_NONE || login_ == user::LOGGED_IN_LOCKED || |
+ userAddingRunning) |
return; |
ash::SystemTrayDelegate* delegate = |