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

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: Minor fix Created 6 years, 5 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
« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..829015ca213be0d207fbca5eef812e7a3fcf40f8 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,11 @@ 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)
+ if (login_ == user::LOGGED_IN_NONE || login_ == user::LOGGED_IN_LOCKED ||
+ ash::Shell::GetInstance()
+ ->session_state_delegate()
+ ->GetSessionState() ==
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY)
oshima 2014/07/31 18:28:31 Am I correct that many checks are basically "if a
Roman Sorokin (ftl) 2014/07/31 18:51:32 This method does exist (IsUserSessionBlocked) but
return;
oshima 2014/07/31 18:28:31 you need {} in this case
ash::SystemTrayDelegate* delegate =
« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698