Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ash / system / bluetooth / tray_bluetooth.cc

diff --git a/src/ash/system/bluetooth/tray_bluetooth.cc b/src/ash/system/bluetooth/tray_bluetooth.cc
index 6f4509f..091f24b 100644 (file)
--- a/src/ash/system/bluetooth/tray_bluetooth.cc
+++ b/src/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 =