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

Unified Diff: ash/system/bluetooth/tray_bluetooth.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments Created 6 years, 4 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: 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 =

Powered by Google App Engine
This is Rietveld 408576698